Merge pull request #13969 from jdaugherty/7.0.x

Author: jdaugherty

gradle.properties

@@ -33,7 +33,7 @@ preventSnapshotPublish=false
 slf4jPreventExclusion=true
 
 # Generated on Tue Jan 07 15:14:48 EST 2025 by: ./gradlew :grails-bom:syncProps
-# Only version value modifications allowed after this point. Do not insert or change version names. 
+# Only version value modifications allowed after this point. Do not insert or change version names.
 ant.version=1.10.15
 asciidoctorj.version=3.0.0
 asset-pipeline-gradle.version=5.0.5

grails-plugin-controllers/src/main/groovy/org/grails/compiler/web/ControllerActionTransformer.java

@@ -798,14 +798,12 @@ protected void initializeAndValidateCommandObjectParameter(final BlockStatement
             }
 
             if (argumentIsValidateable) {
-                final MethodCallExpression validateMethodCallExpression =
-                        new MethodCallExpression(new VariableExpression(paramName), "validate", EMPTY_TUPLE);
-                final MethodNode validateMethod =
-                        commandObjectNode.getMethod("validate", new Parameter[0]);
+                final MethodCallExpression validateMethodCallExpression = callX(localVarX(paramName, commandObjectNode), "validate");
+                final MethodNode validateMethod = commandObjectNode.getMethod("validate", new Parameter[0]);
                 if (validateMethod != null) {
                     validateMethodCallExpression.setMethodTarget(validateMethod);
                 }
-                final Statement ifCommandObjectIsNotNullThenValidate = new IfStatement(new BooleanExpression(new VariableExpression(paramName)), new ExpressionStatement(validateMethodCallExpression), new ExpressionStatement(new EmptyExpression()));
+                final Statement ifCommandObjectIsNotNullThenValidate = ifS(boolX(varX(paramName)), stmt(validateMethodCallExpression));
                 wrapper.addStatement(ifCommandObjectIsNotNullThenValidate);
             } else {
                 // try to dynamically invoke the .validate() method if it is available at runtime...

grails-test-suite-web/src/test/groovy/org/grails/web/commandobjects/CommandObjectsSpec.groovy

@@ -304,6 +304,36 @@ class CommandObjectsSpec extends Specification implements ControllerUnitTest<Tes
         commandObject.firstName == 'Douglas'
         commandObject.lastName == 'Mendes'
     }
+
+    @Issue('https://github.com/grails/grails-core/issues/13945')
+    void "calling actions involving inherited command objects - child command"() {
+        given:
+        params.testId = 1
+        params.myId = 3
+        params.pId = 2
+
+        when:
+        def model = controller.zMethodTakingChild()
+        def commandObject = model.commandObject
+
+        then:
+        commandObject.testId == 1
+        commandObject.myId == 3
+        model.pId == 2
+    }
+
+    @Issue('https://github.com/grails/grails-core/issues/13945')
+    void "calling actions involving inherited command objects - parent command"() {
+        given:
+        params.testId = 1
+
+        when:
+        def model = controller.methodTakingParent()
+        def commandObject = model.commandObject
+
+        then:
+        commandObject.testId == 1
+    }
 }
 
 @Artefact('Controller')
@@ -362,6 +392,23 @@ class TestController {
     def methodActionWithGenericBasedCommand(ConcreteGenericBased co) {
         [commandObject: co]
     }
+
+    def zMethodTakingChild(ChildCommand command, long pId) {
+        [commandObject: command, pId: pId]
+    }
+
+    def methodTakingParent(ParentCommand command) {
+        [commandObject: command, pId: 2]
+    }
+}
+
+
+class ParentCommand implements Validateable {
+    int testId
+}
+
+class ChildCommand extends ParentCommand {
+    int myId
 }
 
 class DateComamndObject {