Merge pull request #1416 from grails/improveLoadDataService

puneetbehl · web-flow · commit 1ba886db7502 · 2020-12-17T09:06:39.000+05:30
Improvements to load @service classes
diff --git a/grails-datastore-gorm/src/main/groovy/org/grails/datastore/gorm/bootstrap/AbstractDatastoreInitializer.groovy b/grails-datastore-gorm/src/main/groovy/org/grails/datastore/gorm/bootstrap/AbstractDatastoreInitializer.groovy
@@ -311,7 +311,7 @@ abstract class AbstractDatastoreInitializer implements ResourceLoaderAware{
                 final Class<?> serviceClass = loadServiceClass(clazz)
                 final grails.gorm.services.Service ann = clazz.getAnnotation(grails.gorm.services.Service)
                 String serviceName = ann?.name()
-                if (serviceName == null) {
+                if (!serviceName) {
                     serviceName = Introspector.decapitalize(serviceClass.simpleName)
                 }
                 if (secondaryDatastore) {

Original file line number	Diff line number	Diff line change
`@@ -311,7 +311,7 @@ abstract class AbstractDatastoreInitializer implements ResourceLoaderAware{`
`311`	`311`	`final Class<?> serviceClass = loadServiceClass(clazz)`
`312`	`312`	`final grails.gorm.services.Service ann = clazz.getAnnotation(grails.gorm.services.Service)`
`313`	`313`	`String serviceName = ann?.name()`
`314`		`- if (serviceName == null) {`
	`314`	`+ if (!serviceName) {`
`315`	`315`	`serviceName = Introspector.decapitalize(serviceClass.simpleName)`
`316`	`316`	`}`
`317`	`317`	`if (secondaryDatastore) {`