Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Remove references to servlet-api from @AstTransformer and set compileOnlyApi for trait that need servlet-api #13763

Merged
merged 2 commits into from
Oct 16, 2024
Merged

Remove references to servlet-api from @AstTransformer and set compileOnlyApi for trait that need servlet-api #13763

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
86cc4b5
HttpServletResponse should not be required when using @AstTransformer
codeconsole Oct 16, 2024
fc248d4
servlet-api needed for controller trait compilation
codeconsole Oct 16, 2024
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 2 additions & 0 deletions grails-plugin-controllers/build.gradle
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -6,6 +6,8 @@ dependencies {
project(':grails-plugin-domain-class')

api("org.springframework.boot:spring-boot-autoconfigure:$springBootVersion")
compileOnlyApi "jakarta.servlet:jakarta.servlet-api:$servletApiVersion"

runtimeOnly project(':grails-plugin-i18n')

testRuntimeOnly "jline:jline:$jlineVersion"
Expand Down
4 changes: 2 additions & 2 deletions ...ugin-controllers/src/main/groovy/org/grails/compiler/web/ControllerActionTransformer.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -82,10 +82,10 @@
import org.grails.io.support.GrailsResourceUtils;
import org.grails.plugins.web.controllers.DefaultControllerExceptionHandlerMetaData;
import org.grails.web.databinding.DefaultASTDatabindingHelper;
import org.grails.web.util.WebUtils;
import org.springframework.validation.Errors;
import org.springframework.validation.MapBindingResult;

import jakarta.servlet.http.HttpServletResponse;
import java.io.File;
import java.lang.reflect.Method;
import java.lang.reflect.Modifier;
Expand Down Expand Up @@ -543,7 +543,7 @@ protected BlockStatement getCodeToHandleAllowedMethods(ClassNode controllerClass
isAllowedArgumentList.addExpression(new PropertyExpression(new VariableExpression("this"), DefaultGrailsControllerClass.ALLOWED_HTTP_METHODS_PROPERTY));
final Expression isAllowedMethodCall = new StaticMethodCallExpression(ClassHelper.make(AllowedMethodsHelper.class), "isAllowed", isAllowedArgumentList);
final BooleanExpression isValidRequestMethod = new BooleanExpression(isAllowedMethodCall);
final MethodCallExpression sendErrorMethodCall = new MethodCallExpression(responsePropertyExpression, "sendError", new ConstantExpression(HttpServletResponse.SC_METHOD_NOT_ALLOWED));
final MethodCallExpression sendErrorMethodCall = new MethodCallExpression(responsePropertyExpression, "sendError", new ConstantExpression(WebUtils.SC_METHOD_NOT_ALLOWED));
final ReturnStatement returnStatement = new ReturnStatement(new ConstantExpression(null));
final BlockStatement blockToSendError = new BlockStatement();
blockToSendError.addStatement(new ExpressionStatement(sendErrorMethodCall));
Expand Down
3 changes: 3 additions & 0 deletions grails-web-common/src/main/groovy/org/grails/web/util/WebUtils.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -24,6 +24,7 @@
import jakarta.servlet.ServletContext;
import jakarta.servlet.ServletRequest;
import jakarta.servlet.http.HttpServletRequest;
import jakarta.servlet.http.HttpServletResponse;
import org.grails.web.servlet.mvc.GrailsWebRequest;
import org.grails.web.servlet.view.CompositeViewResolver;
import org.springframework.context.ApplicationContext;
Expand Down Expand Up @@ -67,6 +68,8 @@ public class WebUtils extends org.springframework.web.util.WebUtils {
public static final String EXCEPTION_ATTRIBUTE = "exception";
public static final String ASYNC_REQUEST_URI_ATTRIBUTE = "jakarta.servlet.async.request_uri";

public static final int SC_METHOD_NOT_ALLOWED = HttpServletResponse.SC_METHOD_NOT_ALLOWED;

public static ViewResolver lookupViewResolver(ServletContext servletContext) {
WebApplicationContext wac = WebApplicationContextUtils
.getRequiredWebApplicationContext(servletContext);
Expand Down
Loading