From 067011ef0d9889d0d99ce8f9ff8ebe067c2d27ef Mon Sep 17 00:00:00 2001
From: Georgios Andrianakis <geoand@gmail.com>
Date: Thu, 9 Mar 2023 09:59:55 +0200
Subject: [PATCH] Make request scoped beans work properly in ReaderInterceptors

Fixes: #31692
---
 .../handlers/RequestDeserializeHandler.java   |  1 +
 .../test/BodyPayloadBlockingAllowedTest.java  | 34 ++++++++++++++++++-
 2 files changed, 34 insertions(+), 1 deletion(-)

diff --git a/independent-projects/resteasy-reactive/server/runtime/src/main/java/org/jboss/resteasy/reactive/server/handlers/RequestDeserializeHandler.java b/independent-projects/resteasy-reactive/server/runtime/src/main/java/org/jboss/resteasy/reactive/server/handlers/RequestDeserializeHandler.java
index 768e1612ab778..e6b3a0b7379e0 100644
--- a/independent-projects/resteasy-reactive/server/runtime/src/main/java/org/jboss/resteasy/reactive/server/handlers/RequestDeserializeHandler.java
+++ b/independent-projects/resteasy-reactive/server/runtime/src/main/java/org/jboss/resteasy/reactive/server/handlers/RequestDeserializeHandler.java
@@ -47,6 +47,7 @@ public RequestDeserializeHandler(Class<?> type, Type genericType, List<MediaType
 
     @Override
     public void handle(ResteasyReactiveRequestContext requestContext) throws Exception {
+        requestContext.requireCDIRequestScope();
         MediaType effectiveRequestType = null;
         Object requestType = requestContext.getHeader(HttpHeaders.CONTENT_TYPE, true);
         if (requestType != null) {
diff --git a/independent-projects/resteasy-reactive/server/vertx/src/test/java/org/jboss/resteasy/reactive/server/vertx/test/BodyPayloadBlockingAllowedTest.java b/independent-projects/resteasy-reactive/server/vertx/src/test/java/org/jboss/resteasy/reactive/server/vertx/test/BodyPayloadBlockingAllowedTest.java
index ffbf410ef3493..38fd398fd27d1 100644
--- a/independent-projects/resteasy-reactive/server/vertx/src/test/java/org/jboss/resteasy/reactive/server/vertx/test/BodyPayloadBlockingAllowedTest.java
+++ b/independent-projects/resteasy-reactive/server/vertx/src/test/java/org/jboss/resteasy/reactive/server/vertx/test/BodyPayloadBlockingAllowedTest.java
@@ -3,13 +3,20 @@
 import static io.restassured.RestAssured.given;
 import static org.hamcrest.CoreMatchers.equalTo;
 
+import java.io.IOException;
 import java.util.Base64;
 
+import jakarta.enterprise.context.RequestScoped;
+import jakarta.inject.Inject;
 import jakarta.ws.rs.Consumes;
 import jakarta.ws.rs.POST;
 import jakarta.ws.rs.Path;
 import jakarta.ws.rs.Produces;
+import jakarta.ws.rs.WebApplicationException;
 import jakarta.ws.rs.core.MediaType;
+import jakarta.ws.rs.ext.Provider;
+import jakarta.ws.rs.ext.ReaderInterceptor;
+import jakarta.ws.rs.ext.ReaderInterceptorContext;
 
 import org.jboss.resteasy.reactive.server.core.BlockingOperationSupport;
 import org.jboss.resteasy.reactive.server.vertx.test.framework.ResteasyReactiveUnitTest;
@@ -25,7 +32,7 @@ public class BodyPayloadBlockingAllowedTest {
     @RegisterExtension
     static ResteasyReactiveUnitTest test = new ResteasyReactiveUnitTest()
             .setArchiveProducer(() -> ShrinkWrap.create(JavaArchive.class)
-                    .addClasses(TestResource.class));
+                    .addClasses(TestResource.class, TestInterceptor.class, TestRequestScopedBean.class));
 
     @Test
     void testSmallRequestForNonBlocking() {
@@ -81,4 +88,29 @@ public Boolean blocking(String request) {
         }
 
     }
+
+    // the interceptor is used in order to test that a request scoped bean works properly no matter what thread the payload is read from
+
+    @Provider
+    public static class TestInterceptor implements ReaderInterceptor {
+
+        @Inject
+        protected TestRequestScopedBean testRequestScopedBean;
+
+        @Override
+        public Object aroundReadFrom(final ReaderInterceptorContext context) throws IOException, WebApplicationException {
+            var entity = context.proceed();
+            testRequestScopedBean.log((String) entity);
+            return entity;
+        }
+    }
+
+    @RequestScoped
+    public static class TestRequestScopedBean {
+
+        public void log(final String ignored) {
+
+        }
+    }
+
 }