Merge branch '8.0.x' into feature/taglib-method-actions

Author: jdaugherty

grails-gradle/plugins/src/main/groovy/org/grails/gradle/plugin/core/GrailsExtension.groovy

@@ -43,6 +43,7 @@ class GrailsExtension {
         this.project = project
         this.pluginDefiner = new PluginDefiner(project)
         this.indy = project.objects.property(Boolean).convention(false)
+        this.preserveParameterNames = project.objects.property(Boolean).convention(true)
     }
 
     /**
@@ -114,6 +115,12 @@ class GrailsExtension {
         this.indy.set(enabled)
     }
 
+    /**
+     * Keep method and constructor parameter names in class files, allowing frameworks such as Spring to use parameter
+     * names for dependency resolution, including autowiring by name without requiring annotations such as @Qualifier.
+     */
+    final Property<Boolean> preserveParameterNames
+
     DependencyHandler getPlugins() {
         if (pluginDefiner == null) {
             pluginDefiner = new PluginDefiner(project)

grails-gradle/plugins/src/main/groovy/org/grails/gradle/plugin/core/GrailsGradlePlugin.groovy

@@ -242,10 +242,17 @@ class GrailsGradlePlugin implements Plugin<Project> {
         // Configure indy and log status after evaluation so user's grails { } block has been applied
         GrailsExtension grailsExtension = project.extensions.findByType(GrailsExtension)
         project.afterEvaluate {
-            boolean indyEnabled = grailsExtension?.indy?.getOrElse(false) ?: false
+            boolean indyEnabled = grailsExtension.indy.getOrElse(false)
+            Boolean preserveParameterNames = grailsExtension.preserveParameterNames.getOrNull()
+
             project.tasks.withType(GroovyCompile).configureEach { GroovyCompile c ->
                 c.groovyOptions.optimizationOptions.indy = indyEnabled
+
+                if (preserveParameterNames != null) {
+                    c.groovyOptions.parameters = preserveParameterNames
+                }
             }
+
             if (!indyEnabled) {
                 project.logger.info('Grails: Groovy invokedynamic (indy) is disabled to improve performance (see issue #15293).')
                 project.logger.info('        To enable invokedynamic: grails { indy = true } in build.gradle')
@@ -528,7 +535,7 @@ ${importStatements}
 
     protected GrailsExtension registerGrailsExtension(Project project) {
         if (project.extensions.findByName('grails') == null) {
-            project.extensions.add('grails', new GrailsExtension(project))
+            project.extensions.create('grails', GrailsExtension, project)
         }
     }
 

grails-gradle/plugins/src/test/groovy/org/grails/gradle/plugin/core/GrailsGradlePreserveParametersSpec.groovy

@@ -0,0 +1,83 @@
+/*
+ *  Licensed to the Apache Software Foundation (ASF) under one
+ *  or more contributor license agreements.  See the NOTICE file
+ *  distributed with this work for additional information
+ *  regarding copyright ownership.  The ASF licenses this file
+ *  to you under the Apache License, Version 2.0 (the
+ *  "License"); you may not use this file except in compliance
+ *  with the License.  You may obtain a copy of the License at
+ *
+ *    https://www.apache.org/licenses/LICENSE-2.0
+ *
+ *  Unless required by applicable law or agreed to in writing,
+ *  software distributed under the License is distributed on an
+ *  "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+ *  KIND, either express or implied.  See the License for the
+ *  specific language governing permissions and limitations
+ *  under the License.
+ */
+package org.grails.gradle.plugin.core
+
+class GrailsGradlePreserveParametersSpec extends GradleSpecification {
+
+    def "Grails extension is created with default preserveParameterNames = true"() {
+        given:
+        setupTestResourceProject('preserve-params-default')
+
+        when:
+        def result = executeTask('inspectPreserveParam')
+
+        then:
+        result.output.contains("HAS_PRESERVE_PARAM_ENABLED=true")
+    }
+
+    def "preserveParameterNames can be configured to false via grails block"() {
+        given:
+        setupTestResourceProject('preserve-params-disabled')
+
+        when:
+        def result = executeTask('inspectPreserveParam')
+
+        then:
+        result.output.contains("HAS_PRESERVE_PARAM_ENABLED=false")
+    }
+
+    def "preserveParameterNames falls back to true convention when assigned null"() {
+        given:
+        setupTestResourceProject('preserve-params-null')
+
+        when:
+        def result = executeTask('inspectPreserveParam')
+
+        then:
+        //  For Gradle properties, assigning null does not set the value to null as the final resolved value.
+        // It clears/unsets the explicit value. Once the explicit value is absent, getOrNull() resolves to
+        // the property’s convention value, which is true.
+        result.output.contains("HAS_PRESERVE_PARAM_ENABLED=true")
+    }
+
+    def "preserveParameterNames provider with no value leaves GroovyCompile parameters unchanged"() {
+        given:
+        setupTestResourceProject('preserve-params-provider-null')
+
+        when:
+        def result = executeTask('inspectPreserveParam')
+
+        then:
+        // when actually assigned via a provider null, the value will not be set and will remain the default value, which
+        // is false for GroovyCompile
+        result.output.contains("HAS_PRESERVE_PARAM_ENABLED=false")
+    }
+
+    def "GroovyCompile tasks get parameters = true when preserveParameterNames is enabled"() {
+        given:
+        setupTestResourceProject('preserve-params-enabled')
+
+        when:
+        def result = executeTask('inspectPreserveParam')
+
+        then:
+        result.output.contains("HAS_PRESERVE_PARAM_ENABLED=true")
+    }
+
+}

grails-gradle/plugins/src/test/resources/test-projects/preserve-params-default/build.gradle

@@ -0,0 +1,11 @@
+plugins {
+    id 'org.apache.grails.gradle.grails-app'
+}
+
+tasks.register('inspectPreserveParam') {
+    doLast {
+        def compileTasks = tasks.withType(GroovyCompile)
+        def paramsEnabled = compileTasks.every { it.groovyOptions.parameters }
+        println "HAS_PRESERVE_PARAM_ENABLED=${paramsEnabled}"
+    }
+}

grails-gradle/plugins/src/test/resources/test-projects/preserve-params-default/gradle.properties

@@ -0,0 +1 @@
+grailsVersion=__PROJECT_VERSION__

grails-gradle/plugins/src/test/resources/test-projects/preserve-params-default/grails-app/conf/application.yml

@@ -0,0 +1 @@
+rootProject.name = 'test-preserve-params-default'

grails-gradle/plugins/src/test/resources/test-projects/preserve-params-default/settings.gradle

@@ -0,0 +1,15 @@
+plugins {
+    id 'org.apache.grails.gradle.grails-app'
+}
+
+grails {
+    preserveParameterNames = false
+}
+
+tasks.register('inspectPreserveParam') {
+    doLast {
+        def compileTasks = tasks.withType(GroovyCompile)
+        def paramsEnabled = compileTasks.every { it.groovyOptions.parameters }
+        println "HAS_PRESERVE_PARAM_ENABLED=${paramsEnabled}"
+    }
+}

grails-gradle/plugins/src/test/resources/test-projects/preserve-params-disabled/build.gradle

@@ -0,0 +1 @@
+grailsVersion=__PROJECT_VERSION__