introduce --extends to scaffold generation scripts.

codeconsole · codeconsole · commit f487f1f66307 · 2025-11-28T17:38:35.000-08:00
diff --git a/grails-scaffolding/grails-app/commands/scaffolding/CreateScaffoldControllerCommand.groovy b/grails-scaffolding/grails-app/commands/scaffolding/CreateScaffoldControllerCommand.groovy
@@ -58,10 +58,13 @@ class CreateScaffoldControllerCommand implements GrailsApplicationCommand, Comma
 
         String namespace = flag('namespace')
         boolean useService = isFlagPresent('service')
+        String extendsClass = flag('extends')
 
         Map<String, Object> templateModel = model.asMap()
         templateModel.put('useService', useService)
         templateModel.put('namespace', namespace ?: '')
+        templateModel.put('extendsClass', extendsClass ?: '')
+        templateModel.put('extendsClassName', extendsClass ? extendsClass.substring(extendsClass.lastIndexOf('.') + 1) : '')
 
         String destinationPath = "grails-app/controllers/${model.packagePath}"
 
diff --git a/grails-scaffolding/grails-app/commands/scaffolding/CreateScaffoldServiceCommand.groovy b/grails-scaffolding/grails-app/commands/scaffolding/CreateScaffoldServiceCommand.groovy
@@ -56,9 +56,16 @@ class CreateScaffoldServiceCommand implements GrailsApplicationCommand, CommandL
         }
         boolean overwrite = isFlagPresent('force')
         final Model model = model(sourceClass)
+
+        String extendsClass = flag('extends')
+
+        Map<String, Object> templateModel = model.asMap()
+        templateModel.put('extendsClass', extendsClass ?: '')
+        templateModel.put('extendsClassName', extendsClass ? extendsClass.substring(extendsClass.lastIndexOf('.') + 1) : '')
+
         render(template: template('scaffolding/ScaffoldedService.groovy'),
                 destination: file("grails-app/services/${model.packagePath}/${model.convention('Service')}.groovy"),
-                model: model,
+                model: templateModel,
                 overwrite: overwrite)
         verbose('Scaffold service created for domain class')
 
diff --git a/grails-scaffolding/grails-app/commands/scaffolding/GenerateScaffoldAllCommand.groovy b/grails-scaffolding/grails-app/commands/scaffolding/GenerateScaffoldAllCommand.groovy
@@ -58,18 +58,26 @@ class GenerateScaffoldAllCommand implements GrailsApplicationCommand, CommandLin
         final Model model = model(sourceClass)
 
         String namespace = flag('namespace')
+        String serviceExtends = flag('serviceExtends')
+        String controllerExtends = flag('controllerExtends')
 
         // Generate scaffolded service
+        Map<String, Object> serviceTemplateModel = model.asMap()
+        serviceTemplateModel.put('extendsClass', serviceExtends ?: '')
+        serviceTemplateModel.put('extendsClassName', serviceExtends ? serviceExtends.substring(serviceExtends.lastIndexOf('.') + 1) : '')
+
         render(template: template('scaffolding/ScaffoldedService.groovy'),
                 destination: file("grails-app/services/${model.packagePath}/${model.convention('Service')}.groovy"),
-                model: model,
+                model: serviceTemplateModel,
                 overwrite: overwrite)
         verbose('Scaffold service created for domain class')
 
         // Generate scaffolded controller with service reference
         Map<String, Object> templateModel = model.asMap()
         templateModel.put('useService', true)
         templateModel.put('namespace', namespace ?: '')
+        templateModel.put('extendsClass', controllerExtends ?: '')
+        templateModel.put('extendsClassName', controllerExtends ? controllerExtends.substring(controllerExtends.lastIndexOf('.') + 1) : '')
 
         String controllerDestinationPath = "grails-app/controllers/${model.packagePath}"
 
diff --git a/grails-scaffolding/src/main/scripts/CreateScaffoldController.groovy b/grails-scaffolding/src/main/scripts/CreateScaffoldController.groovy
@@ -18,22 +18,26 @@
  */
 
 description("Creates a scaffolded controller") {
-  	usage 'create-controller [controller name]'
+  	usage 'create-scaffold-controller [controller name]'
     completer org.grails.cli.interactive.completers.DomainClassCompleter
     argument name:'Controller Name', description:"The name of controller", required:true
     flag name:'force', description:"Whether to overwrite existing files"
     flag name:'namespace', description:"The namespace for the controller"
-    flag name:'service', description:"Use RestfulServiceController instead of RestfulController as a base class"
+    flag name:'service', description:"Use grails.plugin.scaffolding.RestfulServiceController instead of grails.rest.RestfulController"
+    flag name:'extends', description:"The superclass for the controller (default: grails.rest.RestfulController)"
  }
 
 def modelInstance = model(args[0])
 def overwrite = flag('force') ? true : false
 def namespace = flag('namespace')
 def useService = flag('service') ? true : false
+def extendsClass = flag('extends')
 
 def templateModel = modelInstance.asMap()
 templateModel.put('useService', useService)
 templateModel.put('namespace', namespace ?: '')
+templateModel.put('extendsClass', extendsClass ?: '')
+templateModel.put('extendsClassName', extendsClass ? extendsClass.substring(extendsClass.lastIndexOf('.') + 1) : '')
 
 def destinationPath = "grails-app/controllers/${modelInstance.packagePath}"
 
diff --git a/grails-scaffolding/src/main/scripts/CreateScaffoldService.groovy b/grails-scaffolding/src/main/scripts/CreateScaffoldService.groovy
@@ -18,18 +18,24 @@
  */
 
 description("Creates a scaffolded service") {
-  	usage 'create-service [service name]'
+  	usage 'create-scaffold-service [service name]'
     completer org.grails.cli.interactive.completers.DomainClassCompleter
     argument name:'Service Name', description:"The name of service", required:true
     flag name:'force', description:"Whether to overwrite existing files"
+    flag name:'extends', description:"The superclass for the service (default: grails.plugin.scaffolding.GormService)"
  }
 
 def modelInstance = model(args[0])
 def overwrite = flag('force') ? true : false
+def extendsClass = flag('extends')
+
+def templateModel = modelInstance.asMap()
+templateModel.put('extendsClass', extendsClass ?: '')
+templateModel.put('extendsClassName', extendsClass ? extendsClass.substring(extendsClass.lastIndexOf('.') + 1) : '')
 
 render 	 template: template('scaffolding/ScaffoldedService.groovy'),
 	     destination: file("grails-app/services/${modelInstance.packagePath}/${modelInstance.convention("Service")}.groovy"),
-	     model: modelInstance,
+	     model: templateModel,
 	     overwrite: overwrite
 
 return true
diff --git a/grails-scaffolding/src/main/scripts/GenerateScaffoldAll.groovy b/grails-scaffolding/src/main/scripts/GenerateScaffoldAll.groovy
@@ -23,22 +23,32 @@ description("Generates a scaffolded service and controller") {
     argument name:'Domain Class Name', description:"The name of domain class", required:true
     flag name:'force', description:"Whether to overwrite existing files"
     flag name:'namespace', description:"The namespace for the controller"
+    flag name:'serviceExtends', description:"The superclass for the service (default: grails.plugin.scaffolding.GormService)"
+    flag name:'controllerExtends', description:"The superclass for the controller (default: grails.plugin.scaffolding.RestfulServiceController)"
  }
 
 def modelInstance = model(args[0])
 def overwrite = flag('force') ? true : false
 def namespace = flag('namespace')
+def serviceExtends = flag('serviceExtends')
+def controllerExtends = flag('controllerExtends')
 
 // Generate scaffolded service
+def serviceTemplateModel = modelInstance.asMap()
+serviceTemplateModel.put('extendsClass', serviceExtends ?: '')
+serviceTemplateModel.put('extendsClassName', serviceExtends ? serviceExtends.substring(serviceExtends.lastIndexOf('.') + 1) : '')
+
 render 	 template: template('scaffolding/ScaffoldedService.groovy'),
 	     destination: file("grails-app/services/${modelInstance.packagePath}/${modelInstance.convention("Service")}.groovy"),
-	     model: modelInstance,
+	     model: serviceTemplateModel,
 	     overwrite: overwrite
 
 // Generate scaffolded controller with service reference
-def templateModel = modelInstance.asMap()
-templateModel.put('useService', true)
-templateModel.put('namespace', namespace ?: '')
+def controllerTemplateModel = modelInstance.asMap()
+controllerTemplateModel.put('useService', true)
+controllerTemplateModel.put('namespace', namespace ?: '')
+controllerTemplateModel.put('extendsClass', controllerExtends ?: '')
+controllerTemplateModel.put('extendsClassName', controllerExtends ? controllerExtends.substring(controllerExtends.lastIndexOf('.') + 1) : '')
 
 def controllerDestinationPath = "grails-app/controllers/${modelInstance.packagePath}"
 
@@ -48,7 +58,7 @@ if (namespace) {
 
 render 	 template: template('scaffolding/ScaffoldedController.groovy'),
 	     destination: file("${controllerDestinationPath}/${modelInstance.convention("Controller")}.groovy"),
-	     model: templateModel,
+	     model: controllerTemplateModel,
 	     overwrite: overwrite
 
 return true
diff --git a/grails-scaffolding/src/main/templates/scaffolding/ScaffoldedController.groovy b/grails-scaffolding/src/main/templates/scaffolding/ScaffoldedController.groovy
@@ -2,10 +2,11 @@
 
 import ${packageName}.${className}<% } else { %><%=packageName ? "package ${packageName}" : ''%><% } %>
 
-import grails.plugin.scaffolding.annotation.Scaffold<% if (useService) { %>
+import grails.plugin.scaffolding.annotation.Scaffold<% if (extendsClass) { %>
+import ${extendsClass}<% } else if (useService) { %>
 import grails.plugin.scaffolding.RestfulServiceController<% } %>
 
-<% if (useService) { %>@Scaffold(RestfulServiceController<${className}>)<% } else { %>@Scaffold(${className})<% } %>
+<% if (extendsClass) { %>@Scaffold(${extendsClassName}<${className}>)<% } else if (useService) { %>@Scaffold(RestfulServiceController<${className}>)<% } else { %>@Scaffold(${className})<% } %>
 class ${className}Controller {<% if (namespace) { %>
     static namespace = '${namespace}'
 <% } %>}
diff --git a/grails-scaffolding/src/main/templates/scaffolding/ScaffoldedService.groovy b/grails-scaffolding/src/main/templates/scaffolding/ScaffoldedService.groovy
@@ -1,7 +1,8 @@
 <%=packageName ? "package ${packageName}" : ''%>
 
-import grails.plugin.scaffolding.annotation.Scaffold
+import grails.plugin.scaffolding.annotation.Scaffold<% if (extendsClass) { %>
+import ${extendsClass}<% } %>
 
-@Scaffold(${className})
+<% if (extendsClass) { %>@Scaffold(${extendsClassName}<${className}>)<% } else { %>@Scaffold(${className})<% } %>
 class ${className}Service {
 }

Original file line number	Diff line number	Diff line change
`@@ -1,7 +1,8 @@`
`1`	`1`	`<%=packageName ? "package ${packageName}" : ''%>`
`2`	`2`
`3`		`-import grails.plugin.scaffolding.annotation.Scaffold`
	`3`	`+import grails.plugin.scaffolding.annotation.Scaffold<% if (extendsClass) { %>`
	`4`	`+import ${extendsClass}<% } %>`
`4`	`5`
`5`		`-@Scaffold(${className})`
	`6`	`+<% if (extendsClass) { %>@Scaffold(${extendsClassName}<${className}>)<% } else { %>@Scaffold(${className})<% } %>`
`6`	`7`	`class ${className}Service {`
`7`	`8`	`}`