From 1a148e3c97e5831b64c718ff59628d7f47ee5393 Mon Sep 17 00:00:00 2001 From: Georgios Andrianakis Date: Fri, 24 Sep 2021 09:39:25 +0300 Subject: [PATCH] Support the Mutiny AsyncFile type as a return type Fixes: #20352 --- .../deployment/ResteasyReactiveProcessor.java | 10 ++- .../server/test/providers/FileResource.java | 6 ++ .../server/test/providers/FileTestCase.java | 5 ++ ...erverMutinyAsyncFileMessageBodyWriter.java | 81 +++++++++++++++++++ 4 files changed, 100 insertions(+), 2 deletions(-) create mode 100644 extensions/resteasy-reactive/quarkus-resteasy-reactive/runtime/src/main/java/io/quarkus/resteasy/reactive/server/runtime/ServerMutinyAsyncFileMessageBodyWriter.java diff --git a/extensions/resteasy-reactive/quarkus-resteasy-reactive/deployment/src/main/java/io/quarkus/resteasy/reactive/server/deployment/ResteasyReactiveProcessor.java b/extensions/resteasy-reactive/quarkus-resteasy-reactive/deployment/src/main/java/io/quarkus/resteasy/reactive/server/deployment/ResteasyReactiveProcessor.java index ae20fbfb51049..713387aad45de 100644 --- a/extensions/resteasy-reactive/quarkus-resteasy-reactive/deployment/src/main/java/io/quarkus/resteasy/reactive/server/deployment/ResteasyReactiveProcessor.java +++ b/extensions/resteasy-reactive/quarkus-resteasy-reactive/deployment/src/main/java/io/quarkus/resteasy/reactive/server/deployment/ResteasyReactiveProcessor.java @@ -106,6 +106,7 @@ import io.quarkus.resteasy.reactive.server.runtime.ResteasyReactiveRecorder; import io.quarkus.resteasy.reactive.server.runtime.ResteasyReactiveRuntimeRecorder; import io.quarkus.resteasy.reactive.server.runtime.ResteasyReactiveServerRuntimeConfig; +import io.quarkus.resteasy.reactive.server.runtime.ServerMutinyAsyncFileMessageBodyWriter; import io.quarkus.resteasy.reactive.server.runtime.ServerVertxAsyncFileMessageBodyWriter; import io.quarkus.resteasy.reactive.server.runtime.ServerVertxBufferMessageBodyWriter; import io.quarkus.resteasy.reactive.server.runtime.exceptionmappers.AuthenticationCompletionExceptionMapper; @@ -137,7 +138,6 @@ import io.quarkus.vertx.http.runtime.VertxHttpRecorder; import io.vertx.core.Handler; import io.vertx.core.buffer.Buffer; -import io.vertx.core.file.AsyncFile; import io.vertx.ext.web.RoutingContext; public class ResteasyReactiveProcessor { @@ -177,7 +177,13 @@ void vertxIntegration(BuildProducer writerBuildItemB Priorities.USER)); writerBuildItemBuildProducer .produce(new MessageBodyWriterBuildItem(ServerVertxAsyncFileMessageBodyWriter.class.getName(), - AsyncFile.class.getName(), Collections.singletonList(MediaType.WILDCARD), RuntimeType.SERVER, true, + io.vertx.core.file.AsyncFile.class.getName(), Collections.singletonList(MediaType.WILDCARD), + RuntimeType.SERVER, true, + Priorities.USER)); + writerBuildItemBuildProducer + .produce(new MessageBodyWriterBuildItem(ServerMutinyAsyncFileMessageBodyWriter.class.getName(), + io.vertx.mutiny.core.file.AsyncFile.class.getName(), Collections.singletonList(MediaType.WILDCARD), + RuntimeType.SERVER, true, Priorities.USER)); } diff --git a/extensions/resteasy-reactive/quarkus-resteasy-reactive/deployment/src/test/java/io/quarkus/resteasy/reactive/server/test/providers/FileResource.java b/extensions/resteasy-reactive/quarkus-resteasy-reactive/deployment/src/test/java/io/quarkus/resteasy/reactive/server/test/providers/FileResource.java index 43ade43b94e67..e2c714dae1ce9 100644 --- a/extensions/resteasy-reactive/quarkus-resteasy-reactive/deployment/src/test/java/io/quarkus/resteasy/reactive/server/test/providers/FileResource.java +++ b/extensions/resteasy-reactive/quarkus-resteasy-reactive/deployment/src/test/java/io/quarkus/resteasy/reactive/server/test/providers/FileResource.java @@ -56,6 +56,12 @@ public Uni getAsyncFile(RoutingContext vertxRequest) { }); } + @Path("mutiny-async-file") + @GET + public Uni getMutinyAsyncFile(RoutingContext vertxRequest) { + return new io.vertx.mutiny.core.Vertx(vertxRequest.vertx()).fileSystem().open(FILE, new OpenOptions()); + } + @Path("async-file-partial") @GET public Uni getAsyncFilePartial(RoutingContext vertxRequest) { diff --git a/extensions/resteasy-reactive/quarkus-resteasy-reactive/deployment/src/test/java/io/quarkus/resteasy/reactive/server/test/providers/FileTestCase.java b/extensions/resteasy-reactive/quarkus-resteasy-reactive/deployment/src/test/java/io/quarkus/resteasy/reactive/server/test/providers/FileTestCase.java index 43c13685b50b5..5ec061cc21030 100644 --- a/extensions/resteasy-reactive/quarkus-resteasy-reactive/deployment/src/test/java/io/quarkus/resteasy/reactive/server/test/providers/FileTestCase.java +++ b/extensions/resteasy-reactive/quarkus-resteasy-reactive/deployment/src/test/java/io/quarkus/resteasy/reactive/server/test/providers/FileTestCase.java @@ -78,6 +78,11 @@ public void testFiles() throws Exception { .header(HttpHeaders.CONTENT_LENGTH, Matchers.nullValue()) .statusCode(200) .body(Matchers.equalTo(content)); + RestAssured.get("/providers/file/mutiny-async-file") + .then() + .header(HttpHeaders.CONTENT_LENGTH, Matchers.nullValue()) + .statusCode(200) + .body(Matchers.equalTo(content)); RestAssured.get("/providers/file/async-file-partial") .then() .statusCode(200) diff --git a/extensions/resteasy-reactive/quarkus-resteasy-reactive/runtime/src/main/java/io/quarkus/resteasy/reactive/server/runtime/ServerMutinyAsyncFileMessageBodyWriter.java b/extensions/resteasy-reactive/quarkus-resteasy-reactive/runtime/src/main/java/io/quarkus/resteasy/reactive/server/runtime/ServerMutinyAsyncFileMessageBodyWriter.java new file mode 100644 index 0000000000000..d09ecff7a03be --- /dev/null +++ b/extensions/resteasy-reactive/quarkus-resteasy-reactive/runtime/src/main/java/io/quarkus/resteasy/reactive/server/runtime/ServerMutinyAsyncFileMessageBodyWriter.java @@ -0,0 +1,81 @@ +package io.quarkus.resteasy.reactive.server.runtime; + +import java.io.IOException; +import java.io.OutputStream; +import java.lang.annotation.Annotation; +import java.lang.reflect.Type; + +import javax.ws.rs.WebApplicationException; +import javax.ws.rs.core.HttpHeaders; +import javax.ws.rs.core.MediaType; +import javax.ws.rs.core.MultivaluedMap; +import javax.ws.rs.ext.Provider; + +import org.jboss.resteasy.reactive.server.core.ResteasyReactiveRequestContext; +import org.jboss.resteasy.reactive.server.spi.ResteasyReactiveResourceInfo; +import org.jboss.resteasy.reactive.server.spi.ServerHttpResponse; +import org.jboss.resteasy.reactive.server.spi.ServerMessageBodyWriter; +import org.jboss.resteasy.reactive.server.spi.ServerRequestContext; + +import io.vertx.mutiny.core.file.AsyncFile; + +@Provider +public class ServerMutinyAsyncFileMessageBodyWriter implements ServerMessageBodyWriter { + + @Override + public boolean isWriteable(Class type, Type genericType, ResteasyReactiveResourceInfo target, MediaType mediaType) { + return isWritable(type); + } + + @Override + public boolean isWriteable(Class type, Type genericType, Annotation[] annotations, MediaType mediaType) { + return isWritable(type); + } + + private boolean isWritable(Class type) { + // allow for subtypes, such as AsyncFileImpl + return AsyncFile.class.isAssignableFrom(type); + } + + @Override + public void writeResponse(AsyncFile file, Type genericType, ServerRequestContext context) throws WebApplicationException { + ResteasyReactiveRequestContext ctx = ((ResteasyReactiveRequestContext) context); + ctx.suspend(); + ServerHttpResponse response = context.serverResponse(); + // this is only set by nice people, unfortunately + if (file.getReadLength() != Long.MAX_VALUE) { + response.setResponseHeader(HttpHeaders.CONTENT_LENGTH, String.valueOf(file.getReadLength())); + } else { + response.setChunked(true); + } + file.handler(buffer -> { + try { + response.write(buffer.getBytes()); + } catch (Exception x) { + // believe it or not, this throws + ctx.resume(x); + return; + } + if (response.isWriteQueueFull()) { + file.pause(); + response.addDrainHandler(file::resume); + } + }); + + file.endHandler(new Runnable() { + @Override + public void run() { + file.close(); + response.end(); + // Not sure if I need to resume, actually + ctx.resume(); + } + }); + } + + @Override + public void writeTo(AsyncFile asyncFile, Class type, Type genericType, Annotation[] annotations, MediaType mediaType, + MultivaluedMap httpHeaders, OutputStream entityStream) throws IOException, WebApplicationException { + throw new UnsupportedOperationException("Returning an AsyncFile is not supported with WriterInterceptors"); + } +}