Fix Servlet/Rest ExceptionMapper

Signed-off-by: Phillip Kruger <[email protected]>
gsmet · Apr 5, 2024 · 05471d9 · 05471d9
1 parent ce368d4
commit 05471d9
Show file tree

Hide file tree

Showing 7 changed files with 36 additions and 8 deletions.
diff --git a/...c/main/java/io/quarkus/resteasy/reactive/server/deployment/ResteasyReactiveProcessor.java b/...c/main/java/io/quarkus/resteasy/reactive/server/deployment/ResteasyReactiveProcessor.java
@@ -1280,7 +1280,7 @@ public void setupDeployment(BeanContainerBuildItem beanContainerBuildItem,
         RuntimeValue<Deployment> deployment = recorder.createDeployment(deploymentInfo,
                 beanContainerBuildItem.getValue(), shutdownContext, vertxConfig,
                 requestContextFactoryBuildItem.map(RequestContextFactoryBuildItem::getFactory).orElse(null),
-                initClassFactory, launchModeBuildItem.getLaunchMode());
+                initClassFactory, launchModeBuildItem.getLaunchMode(), servletPresent);
 
         quarkusRestDeploymentBuildItemBuildProducer
                 .produce(new ResteasyReactiveDeploymentBuildItem(deployment, deploymentPath));

diff --git a/...e/src/main/java/io/quarkus/resteasy/reactive/server/runtime/ResteasyReactiveRecorder.java b/...e/src/main/java/io/quarkus/resteasy/reactive/server/runtime/ResteasyReactiveRecorder.java
@@ -107,7 +107,10 @@ public RuntimeValue<Deployment> createDeployment(DeploymentInfo info,
             ShutdownContext shutdownContext, HttpBuildTimeConfig vertxConfig,
             RequestContextFactory contextFactory,
             BeanFactory<ResteasyReactiveInitialiser> initClassFactory,
-            LaunchMode launchMode) {
+            LaunchMode launchMode,
+            boolean servletPresent) {
+
+        info.setServletPresent(servletPresent);
 
         CurrentRequestManager
                 .setCurrentRequestInstance(new QuarkusCurrentRequest(beanContainer.beanInstance(CurrentVertxRequest.class)));

diff --git a/...tive/server/runtime/src/main/java/org/jboss/resteasy/reactive/server/core/Deployment.java b/...tive/server/runtime/src/main/java/org/jboss/resteasy/reactive/server/core/Deployment.java
@@ -47,12 +47,14 @@ public class Deployment {
     private final ArrayList<RequestMapper.RequestPath<RestInitialHandler.InitialMatch>> classMappers;
     private final List<GenericRuntimeConfigurableServerRestHandler<?>> runtimeConfigurableServerRestHandlers;
     private final RuntimeExceptionMapper exceptionMapper;
+    private final boolean servletPresent;
     private final ResteasyReactiveConfig resteasyReactiveConfig;
     private final Map<String, List<String>> disabledEndpoints;
     //this is not final, as it is set after startup
     private RuntimeConfiguration runtimeConfiguration;
 
-    public Deployment(ExceptionMapping exceptionMapping, ContextResolvers contextResolvers,
+    public Deployment(ExceptionMapping exceptionMapping,
+            ContextResolvers contextResolvers,
             ServerSerialisers serialisers,
             ServerRestHandler[] abortHandlerChain,
             EntityWriter dynamicEntityWriter, String prefix, ParamConverterProviders paramConverterProviders,
@@ -62,6 +64,7 @@ public Deployment(ExceptionMapping exceptionMapping, ContextResolvers contextRes
             ArrayList<RequestMapper.RequestPath<RestInitialHandler.InitialMatch>> classMappers,
             List<GenericRuntimeConfigurableServerRestHandler<?>> runtimeConfigurableServerRestHandlers,
             RuntimeExceptionMapper exceptionMapper,
+            boolean servletPresent,
             ResteasyReactiveConfig resteasyReactiveConfig,
             Map<String, List<String>> disabledEndpoints) {
         this.exceptionMapping = exceptionMapping;
@@ -79,6 +82,7 @@ public Deployment(ExceptionMapping exceptionMapping, ContextResolvers contextRes
         this.classMappers = classMappers;
         this.runtimeConfigurableServerRestHandlers = runtimeConfigurableServerRestHandlers;
         this.exceptionMapper = exceptionMapper;
+        this.servletPresent = servletPresent;
         this.resteasyReactiveConfig = resteasyReactiveConfig;
         this.disabledEndpoints = disabledEndpoints;
     }
@@ -103,6 +107,10 @@ public ExceptionMapping getExceptionMapping() {
         return exceptionMapping;
     }
 
+    public boolean isServletPresent() {
+        return servletPresent;
+    }
+
     public ContextResolvers getContextResolvers() {
         return contextResolvers;
     }

diff --git a/.../server/runtime/src/main/java/org/jboss/resteasy/reactive/server/core/DeploymentInfo.java b/.../server/runtime/src/main/java/org/jboss/resteasy/reactive/server/core/DeploymentInfo.java
@@ -38,6 +38,7 @@ public class DeploymentInfo {
     private String applicationPath;
     private List<HandlerChainCustomizer> globalHandlerCustomizers = new ArrayList<>();
     private boolean developmentMode;
+    private boolean servletPresent = false;
 
     public ResourceInterceptors getInterceptors() {
         return interceptors;
@@ -191,4 +192,13 @@ public DeploymentInfo setDevelopmentMode(boolean developmentMode) {
         this.developmentMode = developmentMode;
         return this;
     }
+
+    public boolean isServletPresent() {
+        return servletPresent;
+    }
+
+    public DeploymentInfo setServletPresent(boolean servletPresent) {
+        this.servletPresent = servletPresent;
+        return this;
+    }
 }
diff --git a/...c/main/java/org/jboss/resteasy/reactive/server/core/startup/RuntimeDeploymentManager.java b/...c/main/java/org/jboss/resteasy/reactive/server/core/startup/RuntimeDeploymentManager.java
@@ -234,7 +234,8 @@ public BeanFactory.BeanInstance<?> apply(Class<?> aClass) {
                 abortHandlingChain.toArray(EMPTY_REST_HANDLER_ARRAY), dynamicEntityWriter,
                 prefix, paramConverterProviders, configurationImpl, applicationSupplier,
                 threadSetupAction, requestContextFactory, preMatchHandlers, classMappers,
-                runtimeConfigurableServerRestHandlers, exceptionMapper, info.getResteasyReactiveConfig(),
+                runtimeConfigurableServerRestHandlers, exceptionMapper, info.isServletPresent(),
+                info.getResteasyReactiveConfig(),
                 disabledEndpoints);
     }
 
@@ -243,7 +244,7 @@ private void forEachMapperEntry(MappersKey key,
         int classTemplateNameCount = key.path.countPathParamNames();
         RuntimeMappingDeployment runtimeMappingDeployment = new RuntimeMappingDeployment(classTemplates);
         ClassRoutingHandler classRoutingHandler = new ClassRoutingHandler(runtimeMappingDeployment.buildClassMapper(),
-                classTemplateNameCount);
+                classTemplateNameCount, info.isServletPresent());
         classMappers.add(new RequestMapper.RequestPath<>(true, key.path,
                 new RestInitialHandler.InitialMatch(new ServerRestHandler[] { classRoutingHandler },
                         runtimeMappingDeployment.getMaxMethodTemplateNameCount() + classTemplateNameCount)));

diff --git a/...untime/src/main/java/org/jboss/resteasy/reactive/server/handlers/ClassRoutingHandler.java b/...untime/src/main/java/org/jboss/resteasy/reactive/server/handlers/ClassRoutingHandler.java
@@ -33,10 +33,13 @@ public class ClassRoutingHandler implements ServerRestHandler {
 
     private final Map<String, RequestMapper<RuntimeResource>> mappers;
     private final int parameterOffset;
+    final boolean servletPresent;
 
-    public ClassRoutingHandler(Map<String, RequestMapper<RuntimeResource>> mappers, int parameterOffset) {
+    public ClassRoutingHandler(Map<String, RequestMapper<RuntimeResource>> mappers, int parameterOffset,
+            boolean servletPresent) {
         this.mappers = mappers;
         this.parameterOffset = parameterOffset;
+        this.servletPresent = servletPresent;
     }
 
     @Override
@@ -226,7 +229,7 @@ private void throwNotFound(ResteasyReactiveRequestContext requestContext) {
         ProvidersImpl providers = requestContext.getProviders();
         ExceptionMapper<NotFoundException> exceptionMapper = providers.getExceptionMapper(NotFoundException.class);
 
-        if (exceptionMapper == null) {
+        if (exceptionMapper == null || servletPresent) {
             if (requestContext.resumeExternalProcessing()) {
                 return;
             }

diff --git a/...runtime/src/main/java/org/jboss/resteasy/reactive/server/handlers/RestInitialHandler.java b/...runtime/src/main/java/org/jboss/resteasy/reactive/server/handlers/RestInitialHandler.java
@@ -63,7 +63,10 @@ public void handle(ResteasyReactiveRequestContext requestContext) throws Excepti
             ProvidersImpl providers = requestContext.getProviders();
             ExceptionMapper<NotFoundException> exceptionMapper = providers.getExceptionMapper(NotFoundException.class);
 
-            if (exceptionMapper != null) {
+            if (exceptionMapper != null && !deployment.isServletPresent()) {
+                // the NotFoundExceptionMapper needs access to the headers so we need to activate the scope
+                requestContext.requireCDIRequestScope();
+                // we want to engage the NotFoundExceptionMapper when nothing is found
                 requestContext.handleException(new NotFoundException());
                 return;
             } else if (requestContext.resumeExternalProcessing()) {