From 63a11167e07098cd7af1cf0ad92908b6238da9cc Mon Sep 17 00:00:00 2001
From: Herve Boutemy <hboutemy@apache.org>
Date: Sat, 3 May 2014 18:51:13 +0000
Subject: [PATCH] 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
---
 .../DefaultMojoAnnotationsScanner.java        | 22 +++++--------------
 1 file changed, 5 insertions(+), 17 deletions(-)

diff --git a/maven-plugin-tools-annotations/src/main/java/org/apache/maven/tools/plugin/annotations/scanner/DefaultMojoAnnotationsScanner.java b/maven-plugin-tools-annotations/src/main/java/org/apache/maven/tools/plugin/annotations/scanner/DefaultMojoAnnotationsScanner.java
index acd813c..d882a70 100644
--- a/maven-plugin-tools-annotations/src/main/java/org/apache/maven/tools/plugin/annotations/scanner/DefaultMojoAnnotationsScanner.java
+++ b/maven-plugin-tools-annotations/src/main/java/org/apache/maven/tools/plugin/annotations/scanner/DefaultMojoAnnotationsScanner.java
@@ -210,9 +210,9 @@ public class DefaultMojoAnnotationsScanner
             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() + ":"
                                        + 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
-        if ( mojoAnnotatedClass == null )
-        {
-            return null;
-        }
-        return mojoAnnotatedClass;
-        /**
-         if ( !mojoAnnotatedClass.getComponents().isEmpty() || !mojoAnnotatedClass.getParameters().isEmpty()
-         || mojoAnnotatedClass.getExecute() != null || mojoAnnotatedClass.getMojo() != null )
-         {
-         return mojoAnnotatedClass;
-         }
-         return null;
-         **/
+        return !( mojoAnnotatedClass.getComponents().isEmpty() && mojoAnnotatedClass.getParameters().isEmpty()
+            && mojoAnnotatedClass.getExecute() == null && mojoAnnotatedClass.getMojo() == null );
     }
 
     protected void populateAnnotationContent( Object content, MojoAnnotationVisitor mojoAnnotationVisitor )