Allow controllers to be lazy initialised - Fixes #9933

Author: graemerocher

grails-plugin-controllers/src/main/groovy/org/grails/plugins/web/controllers/ControllersGrailsPlugin.groovy

@@ -156,6 +156,7 @@ class ControllersGrailsPlugin extends Plugin {
             log.debug "Configuring controller $controller.fullName"
             if (controller.available) {
                 "${controller.fullName}"(controller.clazz) { bean ->
+                    bean.lazyInit = true
                     def beanScope = controller.getScope()
                     bean.scope = beanScope
                     bean.autowire =  "byName"

grails-spring/src/main/groovy/grails/spring/BeanBuilder.java

@@ -653,6 +653,7 @@ protected BeanConfiguration invokeBeanDefiningMethod(String name, Object[] args)
                     currentBeanConfig = springConfig.addSingletonBean(name, beanClass, resolveConstructorArguments(args, 1, args.length));
                 }
             }
+
         }
         else if (args[0] instanceof RuntimeBeanReference) {
             currentBeanConfig = springConfig.addSingletonBean(name);

grails-spring/src/main/groovy/org/grails/spring/DefaultBeanConfiguration.java

@@ -31,6 +31,7 @@
 import org.springframework.beans.factory.config.RuntimeBeanReference;
 import org.springframework.beans.factory.support.AbstractBeanDefinition;
 import org.springframework.beans.factory.support.GenericBeanDefinition;
+import org.springframework.context.annotation.Lazy;
 import org.springframework.util.Assert;
 
 /**
@@ -217,7 +218,10 @@ protected AbstractBeanDefinition createBeanDefinition() {
             }
             bd.setConstructorArgumentValues(cav);
         }
-        bd.setBeanClass(clazz);
+        if(clazz != null) {
+            bd.setLazyInit( clazz.getAnnotation(Lazy.class) != null);
+            bd.setBeanClass(clazz);
+        }
         bd.setScope(singleton ? AbstractBeanDefinition.SCOPE_SINGLETON : AbstractBeanDefinition.SCOPE_PROTOTYPE);
         if (parentName != null) {
             bd.setParentName(parentName);