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 2014/05/02 20:39:11 UTC
svn commit: r1592004 - in
/maven/plugin-tools/trunk/maven-plugin-tools-annotations/src/main/java/org/apache/maven/tools/plugin/annotations/scanner:
DefaultMojoAnnotationsScanner.java visitors/MojoClassVisitor.java
Author: hboutemy
Date: Fri May 2 18:39:11 2014
New Revision: 1592004
URL: http://svn.apache.org/r1592004
Log:
code simplification
Modified:
maven/plugin-tools/trunk/maven-plugin-tools-annotations/src/main/java/org/apache/maven/tools/plugin/annotations/scanner/DefaultMojoAnnotationsScanner.java
maven/plugin-tools/trunk/maven-plugin-tools-annotations/src/main/java/org/apache/maven/tools/plugin/annotations/scanner/visitors/MojoClassVisitor.java
Modified: maven/plugin-tools/trunk/maven-plugin-tools-annotations/src/main/java/org/apache/maven/tools/plugin/annotations/scanner/DefaultMojoAnnotationsScanner.java
URL: http://svn.apache.org/viewvc/maven/plugin-tools/trunk/maven-plugin-tools-annotations/src/main/java/org/apache/maven/tools/plugin/annotations/scanner/DefaultMojoAnnotationsScanner.java?rev=1592004&r1=1592003&r2=1592004&view=diff
==============================================================================
--- maven/plugin-tools/trunk/maven-plugin-tools-annotations/src/main/java/org/apache/maven/tools/plugin/annotations/scanner/DefaultMojoAnnotationsScanner.java (original)
+++ maven/plugin-tools/trunk/maven-plugin-tools-annotations/src/main/java/org/apache/maven/tools/plugin/annotations/scanner/DefaultMojoAnnotationsScanner.java Fri May 2 18:39:11 2014
@@ -255,9 +255,8 @@ public class DefaultMojoAnnotationsScann
try
{
- // @Mojo annotations
- MojoAnnotationVisitor mojoAnnotationVisitor =
- mojoClassVisitor.getAnnotationVisitorMap().get( Mojo.class.getName() );
+ // @Mojo annotation
+ MojoAnnotationVisitor mojoAnnotationVisitor = mojoClassVisitor.getAnnotationVisitor( Mojo.class );
if ( mojoAnnotationVisitor != null )
{
MojoAnnotationContent mojoAnnotationContent = new MojoAnnotationContent();
@@ -265,8 +264,8 @@ public class DefaultMojoAnnotationsScann
mojoAnnotatedClass.setMojo( mojoAnnotationContent );
}
- // @Execute annotations
- mojoAnnotationVisitor = mojoClassVisitor.getAnnotationVisitorMap().get( Execute.class.getName() );
+ // @Execute annotation
+ mojoAnnotationVisitor = mojoClassVisitor.getAnnotationVisitor( Execute.class );
if ( mojoAnnotationVisitor != null )
{
ExecuteAnnotationContent executeAnnotationContent = new ExecuteAnnotationContent();
@@ -275,8 +274,7 @@ public class DefaultMojoAnnotationsScann
}
// @Parameter annotations
- List<MojoFieldVisitor> mojoFieldVisitors =
- mojoClassVisitor.findFieldWithAnnotationClass( Parameter.class.getName() );
+ List<MojoFieldVisitor> mojoFieldVisitors = mojoClassVisitor.findFieldWithAnnotation( Parameter.class );
for ( MojoFieldVisitor mojoFieldVisitor : mojoFieldVisitors )
{
ParameterAnnotationContent parameterAnnotationContent =
@@ -290,7 +288,7 @@ public class DefaultMojoAnnotationsScann
}
// @Component annotations
- mojoFieldVisitors = mojoClassVisitor.findFieldWithAnnotationClass( Component.class.getName() );
+ mojoFieldVisitors = mojoClassVisitor.findFieldWithAnnotation( Component.class );
for ( MojoFieldVisitor mojoFieldVisitor : mojoFieldVisitors )
{
ComponentAnnotationContent componentAnnotationContent =
Modified: maven/plugin-tools/trunk/maven-plugin-tools-annotations/src/main/java/org/apache/maven/tools/plugin/annotations/scanner/visitors/MojoClassVisitor.java
URL: http://svn.apache.org/viewvc/maven/plugin-tools/trunk/maven-plugin-tools-annotations/src/main/java/org/apache/maven/tools/plugin/annotations/scanner/visitors/MojoClassVisitor.java?rev=1592004&r1=1592003&r2=1592004&view=diff
==============================================================================
--- maven/plugin-tools/trunk/maven-plugin-tools-annotations/src/main/java/org/apache/maven/tools/plugin/annotations/scanner/visitors/MojoClassVisitor.java (original)
+++ maven/plugin-tools/trunk/maven-plugin-tools-annotations/src/main/java/org/apache/maven/tools/plugin/annotations/scanner/visitors/MojoClassVisitor.java Fri May 2 18:39:11 2014
@@ -72,6 +72,11 @@ public class MojoClassVisitor
return annotationVisitorMap;
}
+ public MojoAnnotationVisitor getAnnotationVisitor( Class<?> annotation )
+ {
+ return annotationVisitorMap.get( annotation.getName() );
+ }
+
public void setAnnotationVisitorMap( Map<String, MojoAnnotationVisitor> annotationVisitorMap )
{
this.annotationVisitorMap = annotationVisitorMap;
@@ -87,8 +92,10 @@ public class MojoClassVisitor
this.fieldVisitors = fieldVisitors;
}
- public List<MojoFieldVisitor> findFieldWithAnnotationClass( String annotationClassName )
+ public List<MojoFieldVisitor> findFieldWithAnnotation( Class<?> annotation )
{
+ String annotationClassName = annotation.getName();
+
List<MojoFieldVisitor> mojoFieldVisitors = new ArrayList<MojoFieldVisitor>();
for ( MojoFieldVisitor mojoFieldVisitor : this.fieldVisitors )