Fixes grails/gorm-hibernate5#230

* Rename loadDataServices -> loadServices.
* Correctly load the services so that TransactionService and TenantService are also injected.

Author: puneetbehl

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

@@ -19,11 +19,7 @@ import org.grails.datastore.mapping.services.ServiceDefinition
 import org.grails.datastore.mapping.services.SoftServiceLoader
 import org.grails.datastore.mapping.transactions.DatastoreTransactionManager
 import org.springframework.beans.factory.support.BeanDefinitionRegistry
-import org.springframework.context.ApplicationContext
-import org.springframework.context.ApplicationEventPublisher
-import org.springframework.context.ConfigurableApplicationContext
-import org.springframework.context.MessageSource
-import org.springframework.context.ResourceLoaderAware
+import org.springframework.context.*
 import org.springframework.context.support.GenericApplicationContext
 import org.springframework.context.support.StaticMessageSource
 import org.springframework.core.env.ConfigurableEnvironment
@@ -294,7 +290,7 @@ abstract class AbstractDatastoreInitializer implements ResourceLoaderAware{
                     datastore = ref("${type}Datastore")
                 }
             }
-            loadDataServices(null)
+            loadServices(null)
                     .each {serviceName, serviceClass->
                 "$serviceName"(DatastoreServiceMethodInvokingFactoryBean) {
                     targetObject = ref("${type}Datastore")
@@ -306,35 +302,37 @@ abstract class AbstractDatastoreInitializer implements ResourceLoaderAware{
     }
 
     @CompileDynamic
-    protected Map<String, Class<?>> loadDataServices(String secondaryDatastore = null) {
-        Map<String, Class<?>> dataServices = [:]
-        final SoftServiceLoader<Service> services = SoftServiceLoader.load(Service)
-        for (ServiceDefinition<Service> serviceDefinition: services) {
+    protected Map<String, Class<?>> loadServices(String secondaryDatastore = null) {
+        Map<String, Class<?>> services = [:]
+        final SoftServiceLoader<Service> softServiceLoader = SoftServiceLoader.load(Service)
+        for (ServiceDefinition<Service> serviceDefinition: softServiceLoader) {
             if (serviceDefinition.isPresent()) {
                 final Class<Service> clazz = serviceDefinition.getType()
-                if (clazz.simpleName.startsWith('$') && clazz.simpleName.endsWith('Implementation')) {
-                    Class<?> serviceClass = loadServiceClass(clazz)
-                    final grails.gorm.services.Service ann = clazz.getAnnotation(grails.gorm.services.Service)
-                    String serviceName = ann?.name()
-                    if(serviceName == null) {
-                        serviceName = Introspector.decapitalize(serviceClass.simpleName)
-                    }
-                    if (secondaryDatastore) {
-                        serviceName = secondaryDatastore + NameUtils.capitalize(serviceName)
-                    }
-                    if (serviceClass != null && serviceClass != Object.class) {
-                        dataServices.put(serviceName, serviceClass)
-                    }
+                final Class<?> serviceClass = loadServiceClass(clazz)
+                final grails.gorm.services.Service ann = clazz.getAnnotation(grails.gorm.services.Service)
+                String serviceName = ann?.name()
+                if (serviceName == null) {
+                    serviceName = Introspector.decapitalize(serviceClass.simpleName)
+                }
+                if (secondaryDatastore) {
+                    serviceName = secondaryDatastore + NameUtils.capitalize(serviceName)
+                }
+                if (serviceClass != null && serviceClass != Object.class) {
+                    services.put(serviceName, serviceClass)
                 }
             }
         }
-        return dataServices;
+        return services
     }
 
     private Class<?> loadServiceClass(Class<Service> clazz) {
-        final String serviceClassName = clazz.package.getName() + '.' + clazz.simpleName[1..-15]
-        final Class<?> serviceClass = classLoader.loadClass(serviceClassName)
-        serviceClass
+        if (clazz.simpleName.startsWith('$') && clazz.simpleName.endsWith('Implementation')) {
+            final String serviceClassName = clazz.package.getName() + '.' + clazz.simpleName[1..-15]
+            final Class<?> serviceClass = classLoader.loadClass(serviceClassName)
+            serviceClass
+        } else {
+            clazz
+        }
     }
 
     @CompileDynamic