Merge branch '3.1.x' into 3.2.x

Author: graemerocher

grails-plugin-testing/src/main/groovy/org/grails/compiler/injection/test/TestForTransformation.java

@@ -463,8 +463,9 @@ private IfStatement getAutowiringIfStatement(ClassExpression targetClass, Variab
         arguments.addExpression(new ConstantExpression(false));
         BlockStatement assignFromApplicationContext = new BlockStatement();
         ArgumentListExpression argWithClassName = new ArgumentListExpression();
-        MethodCallExpression getClassNameMethodCall = new MethodCallExpression(targetClass, "getName", new ArgumentListExpression());
-        argWithClassName.addExpression(getClassNameMethodCall);
+
+        final PropertyExpression classNamePropertyExpression = new PropertyExpression(targetClass, new ConstantExpression("name"));
+        argWithClassName.addExpression(classNamePropertyExpression);
 
         assignFromApplicationContext.addStatement(new ExpressionStatement(new BinaryExpression(fieldExpression, ASSIGN, new MethodCallExpression(appCtxVar, "getBean", argWithClassName))));
         BlockStatement elseBlock = new BlockStatement();

grails-test-suite-web/src/test/groovy/grails/test/mixin/TestForControllerWithNamePropertySpec.groovy

@@ -0,0 +1,23 @@
+package grails.test.mixin
+
+import grails.artefact.Artefact
+import spock.lang.Issue
+import spock.lang.Specification
+
+@TestFor(SomeController)
+class TestForControllerWithNamePropertySpec extends Specification {
+
+    @Issue('grails/grails-core#10363')
+    void "test referencing a controller with a 'name' property"() {
+        when:
+        controller
+
+        then:
+        notThrown ClassCastException
+    }
+}
+
+@Artefact('Controller')
+class SomeController {
+    String name
+}