Merge branch '3.1.x' of github.com:grails/grails-core into 3.1.x

Author: graemerocher

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;
@@ -968,6 +969,16 @@ public static boolean hasAnyAnnotations(final ClassNode classNode, final Class<?
         return false;
     }
 
+    public static boolean removeAnnotation(final MethodNode methodNode, final Class<? extends Annotation> annotationClass) {
+        List<AnnotationNode> annotations = methodNode.getAnnotations(new ClassNode(annotationClass));
+        if (annotations.size() > 0) {
+            methodNode.getAnnotations().removeAll(annotations);
+            return true;
+        } else {
+            return false;
+        }
+    }
+
     public static void addMethodIfNotPresent(ClassNode controllerClassNode, MethodNode methodNode) {
         MethodNode existing = controllerClassNode.getMethod(methodNode.getName(), methodNode.getParameters());
         if (existing == null) {
@@ -1488,4 +1499,12 @@ public static URL getSourceUrl(SourceUnit source) {
     public static URL getSourceUrl(ClassNode classNode) {
         return getSourceUrl(classNode.getModule().getContext());
     }
+
+    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

@@ -20,6 +20,10 @@
 import static org.grails.compiler.injection.GrailsASTUtils.buildGetMapExpression;
 import static org.grails.compiler.injection.GrailsASTUtils.buildGetPropertyExpression;
 import static org.grails.compiler.injection.GrailsASTUtils.buildSetPropertyExpression;
+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;
@@ -37,6 +41,7 @@
 import groovy.lang.Closure;
 
 import java.io.File;
+import java.lang.annotation.Annotation;
 import java.lang.reflect.Method;
 import java.lang.reflect.Modifier;
 import java.net.URL;
@@ -91,6 +96,7 @@
 import org.codehaus.groovy.runtime.DefaultGroovyMethods;
 import org.codehaus.groovy.syntax.Token;
 import org.codehaus.groovy.syntax.Types;
+import org.codehaus.groovy.transform.trait.Traits;
 import org.grails.compiler.injection.GrailsASTUtils;
 import org.grails.core.DefaultGrailsControllerClass;
 import org.grails.core.artefact.ControllerArtefactHandler;
@@ -232,6 +238,8 @@ private boolean isExceptionHandlingMethod(MethodNode methodNode) {
         return isExceptionHandler;
     }
 
+
+
     private void processMethods(ClassNode classNode, SourceUnit source,
             GeneratorContext context) {
 
@@ -293,12 +301,18 @@ public Object call(Object object) {
      * @return true if the method should be configured as a controller action, false otherwise
      */
     protected boolean methodShouldBeConfiguredAsControllerAction(final MethodNode method) {
+        int minLineNumber = 0;
+        if (isInheritedFromTrait(method) && hasAnnotation(method, Action.class) && hasParameters(method)) {
+            removeAnnotation(method, Action.class);
+            //Trait methods have a line number of -1
+            --minLineNumber;
+        }
         return !method.isStatic() && 
                 method.isPublic() && 
                 !method.isAbstract() &&
                 method.getAnnotations(ACTION_ANNOTATION_NODE.getClassNode()).isEmpty() &&
                 method.getAnnotations(new ClassNode(ControllerMethod.class)).isEmpty() &&
-                method.getLineNumber() >= 0 &&
+                method.getLineNumber() >= minLineNumber &&
                 !method.getName().startsWith("$") &&
                 !method.getReturnType().getName().equals(VOID_TYPE) &&
                 !isExceptionHandlingMethod(method);

grails-plugin-controllers/src/test/groovy/org/codehaus/groovy/grails/compiler/web/ControllerActionTransformerSpec.groovy

@@ -169,23 +169,36 @@ class ControllerActionTransformerSpec extends Specification {
             42 == model.paramValue
     }
 
-   /* void "Test annotated controllers"() {
-        when:
+
+    void "test controller with trait action with params"() {
+        given:
         def cls = gcl.parseClass('''
-            class AnnotatedControllerTransformer1Controller {
-                def action = {
+            @grails.artefact.Artefact('Controller')
+            class TestTraitActionToController implements ShowMethod {
+
+
+            }
+            class MyCommandWithArg implements grails.validation.Validateable {
+
+            }
+            trait ShowMethod {
+
+                @grails.web.Action
+                def show(MyCommandWithArg myCommandWithArg) {
+                    !myCommandWithArg.hasErrors()
                 }
+
             }
             ''')
-
         def controller = cls.newInstance()
 
-        then:
-        controller
-        controller.getClass().getMethod("action", [] as Class[]) != null
+        when:
+        Boolean valid = controller.show()
 
+        then:
+        valid
     }
-*/
+
 
     def cleanup() {
         RequestContextHolder.resetRequestAttributes()