grails/grails-data-hibernate5#202 Update AbstractDatastoreInitializer

Improvements to logic for deriving the Data Service name from the implementation class name.

Author: puneetbehl

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

@@ -298,7 +298,10 @@ abstract class AbstractDatastoreInitializer implements ResourceLoaderAware{
                 if (serviceDefinition.isPresent()) {
                     final Class<Service> clazz = serviceDefinition.getType()
                     if (clazz.simpleName.startsWith('$') && clazz.simpleName.endsWith('Implementation')) {
-                        String serviceClassName = clazz.name - '$' - 'Implementation'
+                        String dataServiceName = clazz.simpleName
+                        dataServiceName = removeDollarChar(dataServiceName)
+                        dataServiceName = removeImplementationString(dataServiceName)
+                        String serviceClassName = clazz.name.replace(clazz.simpleName, dataServiceName)
                         final ClassLoader cl = org.grails.datastore.mapping.reflect.ClassUtils.classLoader
                         final Class<?> serviceClass = cl.loadClass(serviceClassName)
 
@@ -353,6 +356,14 @@ abstract class AbstractDatastoreInitializer implements ResourceLoaderAware{
         throw new UnsupportedOperationException("Method getGrailsValidatorClass no longer supported")
     }
 
+    protected String removeImplementationString(String dataServiceImplementationClassName) {
+        dataServiceImplementationClassName.substring(0, dataServiceImplementationClassName.length() - 14)
+    }
+
+    protected String removeDollarChar(String dataServiceImplementationClassName) {
+        dataServiceImplementationClassName.substring(1)
+    }
+
     @CompileDynamic
     static class GroovyBeanReaderInit {
         static boolean isAvailable() {