Merge pull request #31864 from geoand/#31818

Fix incorrect generic type passed to MessageBodyWriter#writeTo
quarkusio · Mar 15, 2023 · 64ced51 · 64ced51
2 parents 5d1c234 + 304d30e
commit 64ced51
Show file tree

Hide file tree

Showing 5 changed files with 27 additions and 9 deletions.
diff --git a/...rver/runtime/src/main/java/org/jboss/resteasy/reactive/server/core/ServerSerialisers.java b/...rver/runtime/src/main/java/org/jboss/resteasy/reactive/server/core/ServerSerialisers.java
@@ -202,16 +202,19 @@ public static boolean invokeWriter(ResteasyReactiveRequestContext context, Objec
         WriterInterceptor[] writerInterceptors = context.getWriterInterceptors();
         boolean outputStreamSet = context.getOutputStream() != null;
         context.serverResponse().setPreCommitListener(HEADER_FUNCTION);
+
+        RuntimeResource target = context.getTarget();
+        Type genericType;
+        if (context.hasGenericReturnType()) { // make sure that when a Response with a GenericEntity was returned, we use it
+            genericType = context.getGenericReturnType();
+        } else {
+            genericType = target == null ? null : target.getReturnType();
+        }
+
         try {
             if (writer instanceof ServerMessageBodyWriter && writerInterceptors == null && !outputStreamSet) {
                 ServerMessageBodyWriter<Object> quarkusRestWriter = (ServerMessageBodyWriter<Object>) writer;
-                RuntimeResource target = context.getTarget();
-                Type genericType;
-                if (context.hasGenericReturnType()) { // make sure that when a Response with a GenericEntity was returned, we use it
-                    genericType = context.getGenericReturnType();
-                } else {
-                    genericType = target == null ? null : target.getReturnType();
-                }
+
                 Class<?> entityClass = entity.getClass();
                 if (quarkusRestWriter.isWriteable(
                         entityClass,
@@ -234,7 +237,7 @@ public static boolean invokeWriter(ResteasyReactiveRequestContext context, Objec
                         context.setResponseContentType(mediaType);
                     }
                     if (writerInterceptors == null) {
-                        writer.writeTo(entity, entity.getClass(), context.getGenericReturnType(),
+                        writer.writeTo(entity, entity.getClass(), genericType,
                                 context.getAllAnnotations(), context.getResponseMediaType(), response.getHeaders(),
                                 context.getOrCreateOutputStream());
                         context.getOrCreateOutputStream().close();

diff --git a/.../src/main/java/org/jboss/resteasy/reactive/server/handlers/RequestDeserializeHandler.java b/.../src/main/java/org/jboss/resteasy/reactive/server/handlers/RequestDeserializeHandler.java
@@ -54,6 +54,7 @@ public void handle(ResteasyReactiveRequestContext requestContext) throws Excepti
             try {
                 effectiveRequestType = MediaType.valueOf((String) requestType);
             } catch (Exception e) {
+                log.debugv("Incorrect media type", e);
                 throw new WebApplicationException(Response.status(Response.Status.BAD_REQUEST).build());
             }
 
@@ -70,6 +71,7 @@ public void handle(ResteasyReactiveRequestContext requestContext) throws Excepti
         }
         List<MessageBodyReader<?>> readers = serialisers.findReaders(null, type, effectiveRequestType, RuntimeType.SERVER);
         if (readers.isEmpty()) {
+            log.debugv("No matching MessageBodyReader found for type {0} and media type {1}", type, effectiveRequestType);
             throw new NotSupportedException();
         }
         for (MessageBodyReader<?> reader : readers) {
@@ -102,6 +104,7 @@ public void handle(ResteasyReactiveRequestContext requestContext) throws Excepti
                 return;
             }
         }
+        log.debugv("No matching MessageBodyReader found for type {0} and media type {1}", type, effectiveRequestType);
         throw new NotSupportedException("No supported MessageBodyReader found");
     }
 

diff --git a/.../java/org/jboss/resteasy/reactive/server/vertx/test/simple/SimpleQuarkusRestResource.java b/.../java/org/jboss/resteasy/reactive/server/vertx/test/simple/SimpleQuarkusRestResource.java
@@ -239,6 +239,12 @@ public TestClass writer() {
         return new TestClass();
     }
 
+    @GET
+    @Path("uni-writer")
+    public Uni<TestClass> uniWriter() {
+        return Uni.createFrom().item(new TestClass());
+    }
+
     @GET
     @Path("fast-writer")
     @Produces("text/plain")

diff --git a/.../java/org/jboss/resteasy/reactive/server/vertx/test/simple/SimpleQuarkusRestTestCase.java b/.../java/org/jboss/resteasy/reactive/server/vertx/test/simple/SimpleQuarkusRestTestCase.java
@@ -209,6 +209,8 @@ public void testWriter() {
                 .then().body(Matchers.equalTo("OK"));
         RestAssured.get("/simple/writer")
                 .then().body(Matchers.equalTo("WRITER"));
+        RestAssured.get("/simple/uni-writer")
+                .then().body(Matchers.equalTo("WRITER"));
 
         RestAssured.get("/simple/fast-writer")
                 .then().body(Matchers.equalTo("OK"));

diff --git a/.../vertx/src/test/java/org/jboss/resteasy/reactive/server/vertx/test/simple/TestWriter.java b/.../vertx/src/test/java/org/jboss/resteasy/reactive/server/vertx/test/simple/TestWriter.java
@@ -26,7 +26,11 @@ public boolean isWriteable(Class<?> type, Type genericType, Annotation[] annotat
     public void writeTo(TestClass t, Class<?> type, Type genericType, Annotation[] annotations, MediaType mediaType,
             MultivaluedMap<String, Object> httpHeaders, OutputStream entityStream)
             throws IOException, WebApplicationException {
-        entityStream.write("WRITER".getBytes(StandardCharsets.UTF_8));
+        if (genericType.getTypeName().equals(TestClass.class.getName())) {
+            entityStream.write("WRITER".getBytes(StandardCharsets.UTF_8));
+        } else {
+            entityStream.write("INCORRECT GENERIC TYPE".getBytes(StandardCharsets.UTF_8));
+        }
     }
 
 }