Move method to GrailsAstUtils

Author: jameskleeh

grails-core/src/main/groovy/org/grails/compiler/injection/GrailsASTUtils.java

@@ -37,6 +37,7 @@
 import org.codehaus.groovy.syntax.Token;
 import org.codehaus.groovy.syntax.Types;
 import org.codehaus.groovy.transform.sc.StaticCompileTransformation;
+import org.codehaus.groovy.transform.trait.Traits;
 import org.grails.io.support.FileSystemResource;
 import org.grails.io.support.Resource;
 import org.springframework.util.StringUtils;
@@ -1502,4 +1503,8 @@ public static URL getSourceUrl(ClassNode classNode) {
     public static boolean hasParameters(MethodNode methodNode) {
         return methodNode.getParameters().length > 0;
     }
+
+    public static boolean isInheritedFromTrait(MethodNode methodNode) {
+        return hasAnnotation(methodNode, Traits.TraitBridge.class);
+    }
 }

grails-plugin-controllers/src/main/groovy/org/grails/compiler/web/ControllerActionTransformer.java

@@ -23,6 +23,7 @@
 import static org.grails.compiler.injection.GrailsASTUtils.hasAnnotation;
 import static org.grails.compiler.injection.GrailsASTUtils.hasParameters;
 import static org.grails.compiler.injection.GrailsASTUtils.removeAnnotation;
+import static org.grails.compiler.injection.GrailsASTUtils.isInheritedFromTrait;
 import grails.artefact.Artefact;
 import grails.artefact.controller.support.AllowedMethodsHelper;
 import grails.compiler.DelegatingMethod;
@@ -237,9 +238,7 @@ private boolean isExceptionHandlingMethod(MethodNode methodNode) {
         return isExceptionHandler;
     }
 
-    private boolean isTraitMethod(MethodNode methodNode) {
-        return GrailsASTUtils.hasAnnotation(methodNode, Traits.TraitBridge.class);
-    }
+
 
     private void processMethods(ClassNode classNode, SourceUnit source,
             GeneratorContext context) {
@@ -303,7 +302,7 @@ public Object call(Object object) {
      */
     protected boolean methodShouldBeConfiguredAsControllerAction(final MethodNode method) {
         int minLineNumber = 0;
-        if (isTraitMethod(method) && hasAnnotation(method, Action.class) && hasParameters(method)) {
+        if (isInheritedFromTrait(method) && hasAnnotation(method, Action.class) && hasParameters(method)) {
             removeAnnotation(method, Action.class);
             //Trait methods have a line number of -1
             --minLineNumber;