grails/grails-data-hibernate5#202 Update DatastoreServiceMethodInvokingFactoryBean

to configure autowire by type.

Author: puneetbehl

grails-datastore-core/src/main/groovy/org/grails/datastore/mapping/config/DatastoreServiceMethodInvokingFactoryBean.groovy

@@ -4,7 +4,11 @@ import groovy.transform.CompileStatic
 import groovy.transform.Internal
 import org.grails.datastore.mapping.core.Datastore
 import org.grails.datastore.mapping.services.Service
+import org.springframework.beans.factory.BeanFactory
+import org.springframework.beans.factory.config.AutowireCapableBeanFactory
+import org.springframework.beans.factory.config.ConfigurableBeanFactory
 import org.springframework.beans.factory.config.MethodInvokingFactoryBean
+import org.springframework.lang.Nullable
 
 /**
  * Variant of {#link MethodInvokingFactoryBean} which returns the correct data service type instead of {@code java.lang.Object} so the Autowire with type works correctly.
@@ -13,6 +17,9 @@ import org.springframework.beans.factory.config.MethodInvokingFactoryBean
 @CompileStatic
 class DatastoreServiceMethodInvokingFactoryBean extends MethodInvokingFactoryBean {
 
+    @Nullable
+    private ConfigurableBeanFactory beanFactory
+
     @Override
     Class<?> getObjectType() {
         arguments[0] as Class<?>
@@ -23,7 +30,18 @@ class DatastoreServiceMethodInvokingFactoryBean extends MethodInvokingFactoryBea
         Object object = super.invokeWithTargetException()
         if (object) {
             ((Service) object).setDatastore((Datastore) targetObject)
+            if (beanFactory instanceof AutowireCapableBeanFactory) {
+                ((AutowireCapableBeanFactory) beanFactory).autowireBean(object)
+            }
         }
         object
     }
+
+    @Override
+    void setBeanFactory(BeanFactory beanFactory) {
+        super.setBeanFactory(beanFactory)
+        if (beanFactory instanceof ConfigurableBeanFactory) {
+            this.beanFactory = (ConfigurableBeanFactory) beanFactory
+        }
+    }
 }