Don't use RuntimeDelegate in ResponseHandler

This is needed in order to avoid getting CCE when other implementations of Jakarta REST are on the classpath Closes: quarkusio#36024 (cherry picked from commit c636df6)
aloubyansky · Oct 31, 2023 · 7f3dee5 · 7f3dee5
1 parent 8449c98
commit 7f3dee5
Show file tree

Hide file tree

Showing 2 changed files with 9 additions and 9 deletions.
diff --git a/...er/runtime/src/main/java/org/jboss/resteasy/reactive/server/handlers/ResponseHandler.java b/...er/runtime/src/main/java/org/jboss/resteasy/reactive/server/handlers/ResponseHandler.java
@@ -146,13 +146,13 @@ public Response get() {
                         if (result instanceof GenericEntity) {
                             GenericEntity<?> genericEntity = (GenericEntity<?>) result;
                             requestContext.setGenericReturnType(genericEntity.getType());
-                            responseBuilder = (ResponseBuilderImpl) ResponseImpl.ok(genericEntity.getEntity());
+                            responseBuilder = ResponseBuilderImpl.ok(genericEntity.getEntity());
                         } else if (result == null) {
                             // FIXME: custom status codes depending on method?
-                            responseBuilder = (ResponseBuilderImpl) ResponseImpl.noContent();
+                            responseBuilder = ResponseBuilderImpl.noContent();
                         } else {
                             // FIXME: custom status codes depending on method?
-                            responseBuilder = (ResponseBuilderImpl) ResponseImpl.ok(result);
+                            responseBuilder = ResponseBuilderImpl.ok(result);
                         }
                         if (responseBuilder.getEntity() != null) {
                             EncodedMediaType produces = requestContext.getResponseContentType();

diff --git a/...r/runtime/src/main/java/org/jboss/resteasy/reactive/server/jaxrs/ResponseBuilderImpl.java b/...r/runtime/src/main/java/org/jboss/resteasy/reactive/server/jaxrs/ResponseBuilderImpl.java
@@ -96,19 +96,19 @@ protected AbstractResponseBuilder doClone() {
 
     //TODO: add the rest of static methods of Response if we need them
 
-    public static Response.ResponseBuilder withStatus(Response.Status status) {
-        return new ResponseBuilderImpl().status(status);
+    public static ResponseBuilderImpl withStatus(Response.Status status) {
+        return (ResponseBuilderImpl) new ResponseBuilderImpl().status(status);
     }
 
-    public static Response.ResponseBuilder ok() {
+    public static ResponseBuilderImpl ok() {
         return withStatus(Response.Status.OK);
     }
 
-    public static Response.ResponseBuilder ok(Object entity) {
-        return ok().entity(entity);
+    public static ResponseBuilderImpl ok(Object entity) {
+        return (ResponseBuilderImpl) ok().entity(entity);
     }
 
-    public static Response.ResponseBuilder noContent() {
+    public static ResponseBuilderImpl noContent() {
         return withStatus(Response.Status.NO_CONTENT);
     }
 }