stephenc
/
maven-plugin-tools
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

limit debug output: display found class only when annotation is found 

git-svn-id: https://svn.apache.org/repos/asf/maven/plugin-tools/trunk@1592262 13f79535-47bb-0310-9956-ffa450edef68
master
Herve Boutemy 2014-05-03 18:51:13 +00:00
parent 32a8740e72
commit 63a11167e0
1 changed files with 5 additions and 17 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

22
maven-plugin-tools-annotations/src/main/java/org/apache/maven/tools/plugin/annotations/scanner/DefaultMojoAnnotationsScanner.java
View File

@ -210,9 +210,9 @@ public class DefaultMojoAnnotationsScanner
mojoAnnotatedClass.setMojo( null ); mojoAnnotatedClass.setMojo( null );
} }
if ( isStoreClass( mojoAnnotatedClass ) != null ) if ( mojoAnnotatedClass != null ) // see MPLUGIN-206 we can have intermediate classes without annotations
{ {
if ( getLogger().isDebugEnabled() ) if ( getLogger().isDebugEnabled() && hasMojoAnnotations( mojoAnnotatedClass ) )
{ {
getLogger().debug( "found MojoAnnotatedClass:" + mojoAnnotatedClass.getClassName() + ":" getLogger().debug( "found MojoAnnotatedClass:" + mojoAnnotatedClass.getClassName() + ":"
+ mojoAnnotatedClass ); + mojoAnnotatedClass );
@ -222,22 +222,10 @@ public class DefaultMojoAnnotationsScanner
} }
} }
private MojoAnnotatedClass isStoreClass( MojoAnnotatedClass mojoAnnotatedClass ) private boolean hasMojoAnnotations( MojoAnnotatedClass mojoAnnotatedClass )
{ {
// see MPLUGIN-206 we can have intermediate classes without annotations return !( mojoAnnotatedClass.getComponents().isEmpty() && mojoAnnotatedClass.getParameters().isEmpty()
if ( mojoAnnotatedClass == null ) && mojoAnnotatedClass.getExecute() == null && mojoAnnotatedClass.getMojo() == null );
{
return null;
}
return mojoAnnotatedClass;
/**
if ( !mojoAnnotatedClass.getComponents().isEmpty() || !mojoAnnotatedClass.getParameters().isEmpty()
|| mojoAnnotatedClass.getExecute() != null || mojoAnnotatedClass.getMojo() != null )
{
return mojoAnnotatedClass;
}
return null;
**/
} }
protected void populateAnnotationContent( Object content, MojoAnnotationVisitor mojoAnnotationVisitor ) protected void populateAnnotationContent( Object content, MojoAnnotationVisitor mojoAnnotationVisitor )