fix servlet type controller method binding (#504)

Servlet types shouldn't be interpreted as the body
micronaut-projects · Nov 19, 2024 · 8739f81 · 8739f81
1 parent 7ccb6c1
commit 8739f81
Show file tree

Hide file tree

Showing 2 changed files with 25 additions and 7 deletions.
diff --git a/jaxrs-processor/src/main/java/io/micronaut/jaxrs/processor/JaxRsTypeElementVisitor.java b/jaxrs-processor/src/main/java/io/micronaut/jaxrs/processor/JaxRsTypeElementVisitor.java
@@ -89,12 +89,18 @@ public class JaxRsTypeElementVisitor implements TypeElementVisitor<Object, Objec
 
     // Backwards compatibility
     @NextMajorVersion("Allow only inject values annotated with @Context")
-    private final List<String> JAX_RS_BINDING_TYPES = Stream.of(
-        HttpHeaders.class,
-        Cookie.class,
-        SecurityContext.class,
-        UriInfo.class
-    ).map(Class::getName).toList();
+    private final List<String> JAX_RS_BINDING_TYPES = List.of(
+        HttpHeaders.class.getName(),
+        Cookie.class.getName(),
+        SecurityContext.class.getName(),
+        UriInfo.class.getName(),
+        "jakarta.servlet.ServletContext",
+        "jakarta.servlet.ServletRequest",
+        "jakarta.servlet.http.HttpServletRequest",
+        "jakarta.servlet.ServletResponse",
+        "jakarta.servlet.http.HttpServletResponse",
+        "jakarta.servlet.ServletConfig"
+    );
 
     @Override
     public int getOrder() {

diff --git a/jaxrs-servlet/src/test/java/io/micronaut/jaxrs/servlet/FilterHeaderMutationTest.java b/jaxrs-servlet/src/test/java/io/micronaut/jaxrs/servlet/FilterHeaderMutationTest.java
@@ -3,6 +3,10 @@
 import io.micronaut.http.client.HttpClient;
 import io.micronaut.http.client.annotation.Client;
 import io.micronaut.test.extensions.junit5.annotation.MicronautTest;
+import jakarta.servlet.ServletConfig;
+import jakarta.servlet.ServletContext;
+import jakarta.servlet.http.HttpServletRequest;
+import jakarta.servlet.http.HttpServletResponse;
 import jakarta.ws.rs.GET;
 import jakarta.ws.rs.Path;
 import jakarta.ws.rs.Produces;
@@ -28,8 +32,16 @@ public static class TestResource {
 
         @GET
         @Produces("text/plain")
-        public String get(HttpHeaders httpHeaders) {
+        public String get(HttpHeaders httpHeaders,
+                          HttpServletRequest request,
+                          HttpServletResponse response,
+                          ServletConfig config,
+                          ServletContext servletContext) throws IOException {
             String header = httpHeaders.getHeaderString("foo");
+            Assertions.assertNotNull(response);
+            Assertions.assertNotNull(request);
+            Assertions.assertNotNull(config);
+            Assertions.assertNotNull(servletContext);
             return header != null ? header : "Unknown";
         }
     }