From d6997506a50212feb255cf78aabd8adf9ef0ebb3 Mon Sep 17 00:00:00 2001 From: Paul King Date: Fri, 27 Sep 2024 10:36:30 +1000 Subject: [PATCH] Move declaration to correct place --- .../grails/compiler/web/ControllerActionTransformer.java | 7 +++---- 1 file changed, 3 insertions(+), 4 deletions(-) diff --git a/grails-plugin-controllers/src/main/groovy/org/grails/compiler/web/ControllerActionTransformer.java b/grails-plugin-controllers/src/main/groovy/org/grails/compiler/web/ControllerActionTransformer.java index 7fca974eb4..5db087175f 100644 --- a/grails-plugin-controllers/src/main/groovy/org/grails/compiler/web/ControllerActionTransformer.java +++ b/grails-plugin-controllers/src/main/groovy/org/grails/compiler/web/ControllerActionTransformer.java @@ -753,9 +753,8 @@ protected void initializeAndValidateCommandObjectParameter(final BlockStatement final ClassNode controllerNode, final ClassNode commandObjectNode, final ASTNode actionNode, final String actionName, final String paramName, final SourceUnit source, final GeneratorContext context) { - final DeclarationExpression declareCoExpression = new DeclarationExpression( - new VariableExpression(paramName, commandObjectNode), Token.newSymbol(Types.EQUALS, 0, 0), new EmptyExpression()); - wrapper.addStatement(new ExpressionStatement(declareCoExpression)); + final DeclarationExpression declareCoExpression = declX(localVarX(paramName, commandObjectNode), new EmptyExpression()); + wrapper.addStatement(stmt(declareCoExpression)); if(commandObjectNode.isInterface() || Modifier.isAbstract(commandObjectNode.getModifiers())) { final String warningMessage = "The [" + actionName + "] action in [" + @@ -846,7 +845,7 @@ protected void initializeCommandObjectParameter(final BlockStatement wrapper, final ArgumentListExpression initializeCommandObjectArguments = args(classX(commandObjectNode), constX(paramName)); final MethodCallExpression initializeCommandObjectMethodCall = callThisX("initializeCommandObject", initializeCommandObjectArguments); applyDefaultMethodTarget(initializeCommandObjectMethodCall, commandObjectNode); - final Expression assignCommandObjectToParameter = assignX(varX(paramName, commandObjectNode), initializeCommandObjectMethodCall); + final Expression assignCommandObjectToParameter = assignX(varX(paramName), initializeCommandObjectMethodCall); wrapper.addStatement(stmt(assignCommandObjectToParameter)); }