From c8a2c2c852eeaec417a85b7fb2927e4cd8bec117 Mon Sep 17 00:00:00 2001
From: Michael Yan <rain@rainboyan.com>
Date: Tue, 1 Oct 2024 06:30:46 +0800
Subject: [PATCH] Enhance `ResourceTransform`

Make the generated `BookController` extended from `RestfullController<Book>`,

```groovy
import grails.rest.*

@Resource(uri='/books')
class Book {

    String title

    static constraints = {
        title blank:false
    }
}
```

Closes gh-606
---
 .../web/rest/transform/ResourceTransform.groovy     | 13 +++++++++----
 1 file changed, 9 insertions(+), 4 deletions(-)

diff --git a/grace-plugin-rest/src/main/groovy/org/grails/plugins/web/rest/transform/ResourceTransform.groovy b/grace-plugin-rest/src/main/groovy/org/grails/plugins/web/rest/transform/ResourceTransform.groovy
index b4291ab150..b405e49e7b 100644
--- a/grace-plugin-rest/src/main/groovy/org/grails/plugins/web/rest/transform/ResourceTransform.groovy
+++ b/grace-plugin-rest/src/main/groovy/org/grails/plugins/web/rest/transform/ResourceTransform.groovy
@@ -1,5 +1,5 @@
 /*
- * Copyright 2012-2023 the original author or authors.
+ * Copyright 2012-2024 the original author or authors.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -28,6 +28,7 @@ import org.codehaus.groovy.ast.ClassHelper
 import org.codehaus.groovy.ast.ClassNode
 import org.codehaus.groovy.ast.ConstructorNode
 import org.codehaus.groovy.ast.FieldNode
+import org.codehaus.groovy.ast.GenericsType
 import org.codehaus.groovy.ast.MethodNode
 import org.codehaus.groovy.ast.ModuleNode
 import org.codehaus.groovy.ast.Parameter
@@ -48,6 +49,7 @@ import org.codehaus.groovy.ast.stmt.BlockStatement
 import org.codehaus.groovy.ast.stmt.EmptyStatement
 import org.codehaus.groovy.ast.stmt.ExpressionStatement
 import org.codehaus.groovy.ast.stmt.IfStatement
+import org.codehaus.groovy.ast.tools.GenericsUtils
 import org.codehaus.groovy.control.CompilationUnit
 import org.codehaus.groovy.control.CompilePhase
 import org.codehaus.groovy.control.SourceUnit
@@ -78,7 +80,6 @@ import static org.grails.compiler.injection.GrailsASTUtils.VOID_CLASS_NODE
 import static org.grails.compiler.injection.GrailsASTUtils.ZERO_PARAMETERS
 import static org.grails.compiler.injection.GrailsASTUtils.applyDefaultMethodTarget
 import static org.grails.compiler.injection.GrailsASTUtils.buildThisExpression
-import static org.grails.compiler.injection.GrailsASTUtils.nonGeneric
 import static org.grails.compiler.injection.GrailsASTUtils.processVariableScopes
 
 /**
@@ -131,13 +132,17 @@ class ResourceTransform implements ASTTransformation, CompilationUnitAware {
             Expression superClassAttribute = annotationNode.getMember(ATTR_SUPER_CLASS)
             if (superClassAttribute instanceof ClassExpression) {
                 superClassNode = ((ClassExpression) superClassAttribute).getType()
+                if (superClassNode.isUsingGenerics()) {
+                    superClassNode.setGenericsTypes(new GenericsType(parent))
+                }
             }
             else {
-                superClassNode = ClassHelper.make(RestfulController)
+                superClassNode = GenericsUtils.makeClassSafe(RestfulController)
+                superClassNode.setGenericsTypes(new GenericsType(parent))
             }
 
             ModuleNode ast = source.getAST()
-            ClassNode newControllerClassNode = new ClassNode(className, Modifier.PUBLIC, nonGeneric(superClassNode, parent))
+            ClassNode newControllerClassNode = new ClassNode(className, Modifier.PUBLIC, superClassNode)
 
             AnnotationNode transactionalAnn = new AnnotationNode(TransactionalTransform.MY_TYPE)
             transactionalAnn.addMember(ATTR_READY_ONLY, ConstantExpression.PRIM_TRUE)