Make resource naming consitent with RestfulController

Author: codeconsole

grails-scaffolding/src/main/groovy/grails/plugin/scaffolding/DomainServiceLocator.java

@@ -33,7 +33,7 @@
 /**
  * Resolves the appropriate service bean for a given domain class by:
  *   - Scanning only beans of type GormService
- *   - Matching via: ((GormEntity<?>) service.getResource()).instanceOf(domainClass)
+ *   - Matching via: domainClass.isAssignableFrom(service.getResource())
  *
  * Keeps a single shared cache for the whole app.
  */
@@ -72,28 +72,25 @@ private static <T extends GormEntity<T>> GormService<T> findService(Class<T> dom
 
         for (String name : names) {
             GormService<?> gs = (GormService<?>) ctx.getBean(name);
-            Object resource = gs.getResource();
-            if (resource instanceof GormEntity) {
-                GormEntity<?> ge = (GormEntity<?>) resource;
-                if (ge.instanceOf(domainClass)) {
-                    matchingBeanNames.add(name);
-                    if (match != null) {
-                        throw new IllegalStateException(
-                            "Multiple GormService beans match domain " + domainClass.getName() +
-                            ": " + matchingBeanNames
-                        );
-                    }
-                    @SuppressWarnings("unchecked")
-                    GormService<T> svc = (GormService<T>) gs;
-                    match = svc;
+            Class<?> resourceClass = gs.getResource();
+            if (resourceClass != null && domainClass.isAssignableFrom(resourceClass)) {
+                matchingBeanNames.add(name);
+                if (match != null) {
+                    throw new IllegalStateException(
+                        "Multiple GormService beans match domain " + domainClass.getName() +
+                        ": " + matchingBeanNames
+                    );
                 }
+                @SuppressWarnings("unchecked")
+                GormService<T> svc = (GormService<T>) gs;
+                match = svc;
             }
         }
 
         if (match == null) {
             throw new IllegalStateException(
                 "No GormService bean found for domain " + domainClass.getName() +
-                " using resource.instanceOf(..). Scanned " + names.length + " GormService beans."
+                ". Scanned " + names.length + " GormService beans."
             );
         }
 

grails-scaffolding/src/main/groovy/grails/plugin/scaffolding/GormService.groovy

@@ -35,37 +35,37 @@ import org.grails.datastore.gorm.GormEntityApi
 @CompileStatic
 class GormService<T extends GormEntity<T>> {
 
-    private GormAllOperations<T> resource
-    Class<T> resourceClass
+    private GormAllOperations<T> gormStaticApi
+    Class<T> resource
     String resourceName
     String resourceClassName
     boolean readOnly
 
     GormService(Class<T> resource, boolean readOnly) {
+        this.resource = resource
         this.readOnly = readOnly
-        resourceClass = resource
         resourceClassName = resource.simpleName
         resourceName = GrailsNameUtils.getPropertyName(resource)
     }
 
-    protected GormAllOperations<T> getResource() {
-        if (resource == null) {
+    protected GormAllOperations<T> getGormStaticApi() {
+        if (gormStaticApi == null) {
             // Lazy initialization - happens on first access when GORM is ready
-            resource = GormEnhancer.findStaticApi(resourceClass) as GormAllOperations<T>
+            gormStaticApi = GormEnhancer.findStaticApi(resource) as GormAllOperations<T>
         }
-        return resource
+        return gormStaticApi
     }
 
     T get(Serializable id) {
-        getResource().get(id)
+        getGormStaticApi().get(id)
     }
 
     List<T> list(Map args) {
-        getResource().list(args)
+        getGormStaticApi().list(args)
     }
 
     Long count(Map args) {
-        getResource().count()
+        getGormStaticApi().count()
     }
 
     @Transactional