Igonre jax-rs @Context parameters

See: swagger-api/swagger-core#4498
micronaut-projects · Sep 4, 2024 · b62cfef · b62cfef
1 parent a011b63
commit b62cfef
Showing 1 changed file with 18 additions and 2 deletions.
diff --git a/openapi/src/main/java/io/micronaut/openapi/visitor/ElementUtils.java b/openapi/src/main/java/io/micronaut/openapi/visitor/ElementUtils.java
@@ -239,6 +239,7 @@ public static boolean isIgnoredParameter(TypedElement parameter) {
             || parameter.hasAnnotation("io.micronaut.session.annotation.SessionValue")
             || parameter.hasAnnotation("org.springframework.web.bind.annotation.SessionAttribute")
             || parameter.hasAnnotation("org.springframework.web.bind.annotation.SessionAttributes")
+            || parameter.hasAnnotation("jakarta.ws.rs.core.Context")
             || isIgnoredParameterType(parameter.getType());
     }
 
@@ -251,11 +252,26 @@ public static boolean isIgnoredParameterType(ClassElement parameterType) {
             || parameterType.isAssignable("kotlin.coroutines.Continuation")
             || parameterType.isAssignable(HttpRequest.class)
             || parameterType.isAssignable("io.micronaut.http.BasicAuth")
+
             // servlet API
             || parameterType.isAssignable("jakarta.servlet.http.HttpServletRequest")
             || parameterType.isAssignable("jakarta.servlet.http.HttpServletResponse")
             || parameterType.isAssignable("jakarta.servlet.http.HttpSession")
-            || parameterType.isAssignable("jakarta.servlet.http.PushBuilder")
+            || parameterType.isAssignable("jakarta.servlet.ServletConfig")
+            || parameterType.isAssignable("jakarta.servlet.ServletContext")
+            || parameterType.isAssignable("jakarta.servlet.ServletRequest")
+            || parameterType.isAssignable("jakarta.servlet.ServletResponse")
+
+            // jax-rs
+            || parameterType.isAssignable("jakarta.ws.rs.core.Application")
+            || parameterType.isAssignable("jakarta.ws.rs.core.HttpHeaders")
+            || parameterType.isAssignable("jakarta.ws.rs.core.Request")
+            || parameterType.isAssignable("jakarta.ws.rs.core.SecurityContext")
+            || parameterType.isAssignable("jakarta.ws.rs.core.UriInfo")
+            || parameterType.isAssignable("jakarta.ws.rs.core.Configuration")
+            || parameterType.isAssignable("jakarta.ws.rs.container.ResourceContext")
+            || parameterType.isAssignable("jakarta.ws.rs.ext.Providers")
+
             // spring
             || parameterType.isAssignable("java.io.Reader")
             || parameterType.isAssignable("java.io.OutputStream")
@@ -267,7 +283,7 @@ public static boolean isIgnoredParameterType(ClassElement parameterType) {
             || parameterType.isAssignable("org.springframework.http.HttpMethod")
             || parameterType.isAssignable("org.springframework.validation.BindingResult")
             || parameterType.isAssignable("org.springframework.validation.Errors")
-            ;
+        ;
     }
 
     public static AnnotationMetadata getAnnotationMetadata(Element el) {