From daf8877b3d83972412d24ebb77b3da620ec5e0cb Mon Sep 17 00:00:00 2001
From: Herve Boutemy <hboutemy@apache.org>
Date: Sat, 3 May 2014 19:05:48 +0000
Subject: [PATCH] code simplification

git-svn-id: https://svn.apache.org/repos/asf/maven/plugin-tools/trunk@1592265 13f79535-47bb-0310-9956-ffa450edef68
---
 .../JavaAnnotationsMojoDescriptorExtractor.java           | 4 +---
 .../scanner/DefaultMojoAnnotationsScanner.java            | 8 +-------
 .../plugin/annotations/scanner/MojoAnnotatedClass.java    | 5 +++++
 3 files changed, 7 insertions(+), 10 deletions(-)

diff --git a/maven-plugin-tools-annotations/src/main/java/org/apache/maven/tools/plugin/annotations/JavaAnnotationsMojoDescriptorExtractor.java b/maven-plugin-tools-annotations/src/main/java/org/apache/maven/tools/plugin/annotations/JavaAnnotationsMojoDescriptorExtractor.java
index 8b17b9c..d595438 100644
--- a/maven-plugin-tools-annotations/src/main/java/org/apache/maven/tools/plugin/annotations/JavaAnnotationsMojoDescriptorExtractor.java
+++ b/maven-plugin-tools-annotations/src/main/java/org/apache/maven/tools/plugin/annotations/JavaAnnotationsMojoDescriptorExtractor.java
@@ -186,9 +186,7 @@ public class JavaAnnotationsMojoDescriptorExtractor
 
     private boolean isMojoAnnnotatedClassCandidate( MojoAnnotatedClass mojoAnnotatedClass )
     {
-        return mojoAnnotatedClass != null
-            && !( mojoAnnotatedClass.getComponents().isEmpty() && mojoAnnotatedClass.getParameters().isEmpty()
-                && mojoAnnotatedClass.getExecute() == null && mojoAnnotatedClass.getMojo() == null );
+        return mojoAnnotatedClass != null && mojoAnnotatedClass.hasAnnotations();
     }
 
     protected Map<String, JavaClass> discoverClassesFromSourcesJar( Artifact artifact, PluginToolsRequest request,
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 d882a70..1be6561 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
@@ -212,7 +212,7 @@ public class DefaultMojoAnnotationsScanner
 
         if ( mojoAnnotatedClass != null ) // see MPLUGIN-206 we can have intermediate classes without annotations
         {
-            if ( getLogger().isDebugEnabled() && hasMojoAnnotations( mojoAnnotatedClass ) )
+            if ( getLogger().isDebugEnabled() && mojoAnnotatedClass.hasAnnotations() )
             {
                 getLogger().debug( "found MojoAnnotatedClass:" + mojoAnnotatedClass.getClassName() + ":"
                                        + mojoAnnotatedClass );
@@ -222,12 +222,6 @@ public class DefaultMojoAnnotationsScanner
         }
     }
 
-    private boolean hasMojoAnnotations( MojoAnnotatedClass mojoAnnotatedClass )
-    {
-        return !( mojoAnnotatedClass.getComponents().isEmpty() && mojoAnnotatedClass.getParameters().isEmpty()
-            && mojoAnnotatedClass.getExecute() == null && mojoAnnotatedClass.getMojo() == null );
-    }
-
     protected void populateAnnotationContent( Object content, MojoAnnotationVisitor mojoAnnotationVisitor )
         throws ReflectorException
     {
diff --git a/maven-plugin-tools-annotations/src/main/java/org/apache/maven/tools/plugin/annotations/scanner/MojoAnnotatedClass.java b/maven-plugin-tools-annotations/src/main/java/org/apache/maven/tools/plugin/annotations/scanner/MojoAnnotatedClass.java
index 0f810ca..b775890 100644
--- a/maven-plugin-tools-annotations/src/main/java/org/apache/maven/tools/plugin/annotations/scanner/MojoAnnotatedClass.java
+++ b/maven-plugin-tools-annotations/src/main/java/org/apache/maven/tools/plugin/annotations/scanner/MojoAnnotatedClass.java
@@ -146,6 +146,11 @@ public class MojoAnnotatedClass
         this.artifact = artifact;
     }
 
+    public boolean hasAnnotations()
+    {
+        return !( getComponents().isEmpty() && getParameters().isEmpty() && execute == null && mojo == null );
+    }
+
     @Override
     public String toString()
     {