Improve how command objects are initialized

This is an improvement on 3827c7a.

This is related to apache/grails-data-mapping#580.

Author: jeffscottbrown

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

@@ -873,16 +873,6 @@ public static boolean hasAnnotation(final ClassNode classNode, final Class<? ext
         return !classNode.getAnnotations(new ClassNode(annotationClass)).isEmpty();
     }
 
-    /**
-     * Returns true if classNode is marked with annotationClass
-     * @param methodNode A MethodNode to inspect
-     * @param annotationClass an annotation to look for
-     * @return true if methodNode is marked with annotationClass, otherwise false
-     */
-    public static boolean hasAnnotation(final MethodNode methodNode, final Class<? extends Annotation> annotationClass) {
-        return !methodNode.getAnnotations(new ClassNode(annotationClass)).isEmpty();
-    }
-
     /**
      * @param classNode a ClassNode to search
      * @param annotationsToLookFor Annotations to look for

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

@@ -21,7 +21,6 @@
 import static org.codehaus.groovy.grails.compiler.injection.GrailsASTUtils.buildGetPropertyExpression;
 import static org.codehaus.groovy.grails.compiler.injection.GrailsASTUtils.buildSetPropertyExpression;
 import grails.artefact.Artefact;
-import grails.transaction.Transactional;
 import grails.util.BuildSettings;
 import grails.util.CollectionUtils;
 import grails.validation.ASTValidateableHelper;
@@ -403,16 +402,14 @@ protected void populateMethodWithCommandObjectInitializationCode(final ClassNode
 
     protected MethodNode getMethodToIncludeCommandObjectInitializationCode(final MethodNode methodNode) {
         MethodNode node = methodNode;
-        if(GrailsASTUtils.hasAnnotation(methodNode, Transactional.class)) {
-            final ClassNode declaringClass = methodNode.getDeclaringClass();
-            final String txHandlingMethodName = TransactionalTransform.getTransactionHandlingMethodName(methodNode);
-            final Parameter[] originalMethodParameters = methodNode.getParameters();
-            final Parameter[] txHandlingMethodParams = new Parameter[originalMethodParameters.length + 1];
-            System.arraycopy(originalMethodParameters, 0, txHandlingMethodParams, 0, originalMethodParameters.length);
-            txHandlingMethodParams[txHandlingMethodParams.length-1] = new Parameter(ClassHelper.make(TransactionStatus.class), "transactionStatus");
-            if(declaringClass.hasMethod(txHandlingMethodName, txHandlingMethodParams)) {
-                node = declaringClass.getMethod(txHandlingMethodName, txHandlingMethodParams);
-            }
+        final ClassNode declaringClass = methodNode.getDeclaringClass();
+        final String txHandlingMethodName = TransactionalTransform.getTransactionHandlingMethodName(methodNode);
+        final Parameter[] originalMethodParameters = methodNode.getParameters();
+        final Parameter[] txHandlingMethodParams = new Parameter[originalMethodParameters.length + 1];
+        System.arraycopy(originalMethodParameters, 0, txHandlingMethodParams, 0, originalMethodParameters.length);
+        txHandlingMethodParams[txHandlingMethodParams.length - 1] = new Parameter(ClassHelper.make(TransactionStatus.class), "transactionStatus");
+        if (declaringClass.hasMethod(txHandlingMethodName, txHandlingMethodParams)) {
+            node = declaringClass.getMethod(txHandlingMethodName, txHandlingMethodParams);
         }
         return node;
     }