fix for GRAILS-12080 - Domain classes does not inject services

Author: graemerocher

grails-core/src/main/groovy/grails/config/Settings.groovy

@@ -64,6 +64,11 @@ interface Settings {
      * The default configured constraints for the application
      */
     String GORM_DEFAULT_CONSTRAINTS = 'grails.gorm.default.constraints'
+
+    /**
+     * Whether to autowire instances
+     */
+    String GORM_AUTOWIRE_INSTANCES = "grails.gorm.autowire";
     /**
      * The configured mime types
      */

grails-plugin-controllers/src/main/groovy/org/grails/plugins/web/controllers/api/ControllersDomainBindingApi.java

@@ -15,16 +15,20 @@
  */
 package org.grails.plugins.web.controllers.api;
 
+import grails.config.Config;
+import grails.config.Settings;
 import grails.core.GrailsApplication;
 import grails.core.GrailsDomainClass;
 import grails.core.GrailsDomainClassProperty;
 import grails.util.GrailsMetaClassUtils;
+import grails.util.Holders;
 import grails.web.databinding.DataBindingUtils;
 
 import java.util.Map;
 
 import org.grails.core.artefact.DomainClassArtefactHandler;
 import org.grails.web.servlet.mvc.GrailsWebRequest;
+import org.springframework.beans.factory.config.AutowireCapableBeanFactory;
 import org.springframework.context.ApplicationContext;
 
 /**
@@ -38,6 +42,7 @@ public class ControllersDomainBindingApi {
 
     public static final String AUTOWIRE_DOMAIN_METHOD = "autowireDomain";
 
+
     /**
      * Autowires the instance
      *
@@ -85,6 +90,13 @@ private static GrailsDomainClass getDomainClass(Object instance) {
     }
 
     private static void autowire(Object instance) {
-        GrailsMetaClassUtils.invokeMethodIfExists(instance, AUTOWIRE_DOMAIN_METHOD, new Object[] { instance });
+        final ApplicationContext applicationContext = Holders.findApplicationContext();
+        final Config config = Holders.getConfig();
+        boolean autowire = config != null ? config.getProperty(Settings.GORM_AUTOWIRE_INSTANCES, Boolean.class, true) : true;
+        if(autowire && applicationContext != null) {
+            applicationContext
+                    .getAutowireCapableBeanFactory()
+                    .autowireBeanProperties(instance, AutowireCapableBeanFactory.AUTOWIRE_BY_NAME, false);
+        }
     }
 }

grails-plugin-domain-class/src/main/groovy/org/grails/plugins/domain/DomainClassGrailsPlugin.groovy

@@ -142,13 +142,12 @@ class DomainClassGrailsPlugin extends Plugin {
 
     void onConfigChange(Map<String, Object> event) {
         ConstraintEvalUtils.clearDefaultConstraints()
-        def beans = beans {
+        beans {
             def defaultConstraintsMap = getDefaultConstraints(event.source)
             "${ConstraintsEvaluator.BEAN_NAME}"(ConstraintsEvaluatorFactoryBean) {
                  defaultConstraints = defaultConstraintsMap
             }
         }
-        beans.registerBeans(applicationContext)
         grailsApplication.refreshConstraints()
     }
 }