Merge pull request #1535 from grails/methodInvokingFactoryBean

Update DatastoreServiceMethodInvokingFactoryBean

Author: puneetbehl

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

@@ -17,15 +17,18 @@ import org.springframework.lang.Nullable
 @CompileStatic
 class DatastoreServiceMethodInvokingFactoryBean extends MethodInvokingFactoryBean {
 
+    private Class<?> serviceClass
+
+    DatastoreServiceMethodInvokingFactoryBean(Class<?> serviceClass) {
+        this.serviceClass = serviceClass
+    }
+
     @Nullable
     private ConfigurableBeanFactory beanFactory
 
     @Override
     Class<?> getObjectType() {
-        if (arguments != null && arguments.size() == 1) {
-            return arguments[0] as Class<?>
-        }
-        return super.getObjectType()
+        return serviceClass
     }
 
     @Override

grails-datastore-gorm/src/main/groovy/org/grails/datastore/gorm/bootstrap/AbstractDatastoreInitializer.groovy

@@ -292,7 +292,7 @@ abstract class AbstractDatastoreInitializer implements ResourceLoaderAware{
             }
             loadDataServices(null)
                     .each {serviceName, serviceClass->
-                "$serviceName"(DatastoreServiceMethodInvokingFactoryBean) {
+                "$serviceName"(DatastoreServiceMethodInvokingFactoryBean, serviceClass) {
                     targetObject = ref("${type}Datastore")
                     targetMethod = 'getService'
                     arguments = [serviceClass]