diff --git a/extensions/resteasy-reactive/quarkus-resteasy-reactive-jsonb-common/deployment/src/main/java/io/quarkus/resteasy/reactive/jsonb/common/deployment/ResteasyReactiveJsonbCommonProcessor.java b/extensions/resteasy-reactive/quarkus-resteasy-reactive-jsonb-common/deployment/src/main/java/io/quarkus/resteasy/reactive/jsonb/common/deployment/ResteasyReactiveJsonbCommonProcessor.java index 1ca16e922bd1f..2968bca3f5d04 100644 --- a/extensions/resteasy-reactive/quarkus-resteasy-reactive-jsonb-common/deployment/src/main/java/io/quarkus/resteasy/reactive/jsonb/common/deployment/ResteasyReactiveJsonbCommonProcessor.java +++ b/extensions/resteasy-reactive/quarkus-resteasy-reactive-jsonb-common/deployment/src/main/java/io/quarkus/resteasy/reactive/jsonb/common/deployment/ResteasyReactiveJsonbCommonProcessor.java @@ -3,6 +3,7 @@ import java.util.Collections; import java.util.List; +import javax.ws.rs.RuntimeType; import javax.ws.rs.core.MediaType; import org.jboss.resteasy.reactive.common.util.RestMediaType; @@ -29,33 +30,37 @@ public class ResteasyReactiveJsonbCommonProcessor { VertxJson.JsonArrayDeserializer.class.getName()); @BuildStep - void additionalProviders(BuildProducer additionalBean, - BuildProducer additionalReaders, - BuildProducer additionalWriters) { + public void registerVertxJsonSupport( + BuildProducer serializers, + BuildProducer deserializers) { + serializers.produce(new JsonbSerializerBuildItem(VERTX_SERIALIZERS)); + deserializers.produce(new JsonbDeserializerBuildItem(VERTX_DESERIALIZERS)); + } + + @BuildStep + public void beans(BuildProducer additionalBean) { // make these beans to they can get instantiated with the Quarkus CDI configured Jsonb object additionalBean.produce(AdditionalBeanBuildItem.builder() .addBeanClass(JsonbMessageBodyReader.class.getName()) .addBeanClass(JsonbMessageBodyWriter.class.getName()) .setUnremovable().build()); + } + + public static void additionalProviders(BuildProducer additionalReaders, + BuildProducer additionalWriters, RuntimeType runtimeType) { additionalReaders.produce( new MessageBodyReaderBuildItem.Builder(JsonbMessageBodyReader.class.getName(), Object.class.getName()) .setMediaTypeStrings(Collections.singletonList(MediaType.APPLICATION_JSON)) .setBuiltin(true) + .setRuntimeType(runtimeType) .build()); additionalWriters.produce( new MessageBodyWriterBuildItem.Builder(JsonbMessageBodyWriter.class.getName(), Object.class.getName()) .setMediaTypeStrings(List.of(MediaType.APPLICATION_JSON, RestMediaType.APPLICATION_NDJSON, RestMediaType.APPLICATION_STREAM_JSON)) .setBuiltin(true) + .setRuntimeType(runtimeType) .build()); } - - @BuildStep - public void registerVertxJsonSupport( - BuildProducer serializers, - BuildProducer deserializers) { - serializers.produce(new JsonbSerializerBuildItem(VERTX_SERIALIZERS)); - deserializers.produce(new JsonbDeserializerBuildItem(VERTX_DESERIALIZERS)); - } } diff --git a/extensions/resteasy-reactive/quarkus-resteasy-reactive-jsonb/deployment/src/main/java/io/quarkus/resteasy/reactive/jsonb/deployment/ResteasyReactiveJsonbProcessor.java b/extensions/resteasy-reactive/quarkus-resteasy-reactive-jsonb/deployment/src/main/java/io/quarkus/resteasy/reactive/jsonb/deployment/ResteasyReactiveJsonbProcessor.java index a674d8d89bdfa..c07aad621200e 100644 --- a/extensions/resteasy-reactive/quarkus-resteasy-reactive-jsonb/deployment/src/main/java/io/quarkus/resteasy/reactive/jsonb/deployment/ResteasyReactiveJsonbProcessor.java +++ b/extensions/resteasy-reactive/quarkus-resteasy-reactive-jsonb/deployment/src/main/java/io/quarkus/resteasy/reactive/jsonb/deployment/ResteasyReactiveJsonbProcessor.java @@ -5,6 +5,10 @@ import io.quarkus.deployment.annotations.BuildStep; import io.quarkus.deployment.builditem.FeatureBuildItem; import io.quarkus.resteasy.reactive.common.deployment.ServerDefaultProducesHandlerBuildItem; +import io.quarkus.resteasy.reactive.jsonb.common.deployment.ResteasyReactiveJsonbCommonProcessor; +import io.quarkus.resteasy.reactive.spi.MessageBodyReaderBuildItem; +import io.quarkus.resteasy.reactive.spi.MessageBodyWriterBuildItem; +import javax.ws.rs.RuntimeType; public class ResteasyReactiveJsonbProcessor { @@ -17,4 +21,11 @@ void feature(BuildProducer feature) { ServerDefaultProducesHandlerBuildItem jsonDefault() { return ServerDefaultProducesHandlerBuildItem.json(); } + + @BuildStep + void additionalProviders(BuildProducer additionalReaders, + BuildProducer additionalWriters) { + ResteasyReactiveJsonbCommonProcessor.additionalProviders(additionalReaders, additionalWriters, + RuntimeType.SERVER); + } } diff --git a/extensions/resteasy-reactive/rest-client-reactive-jsonb/deployment/src/main/java/io/quarkus/rest/client/reactive/jsonb/deployment/RestClientReactiveJsonbProcessor.java b/extensions/resteasy-reactive/rest-client-reactive-jsonb/deployment/src/main/java/io/quarkus/rest/client/reactive/jsonb/deployment/RestClientReactiveJsonbProcessor.java index 533c8f0cbc812..adfcc62e06082 100644 --- a/extensions/resteasy-reactive/rest-client-reactive-jsonb/deployment/src/main/java/io/quarkus/rest/client/reactive/jsonb/deployment/RestClientReactiveJsonbProcessor.java +++ b/extensions/resteasy-reactive/rest-client-reactive-jsonb/deployment/src/main/java/io/quarkus/rest/client/reactive/jsonb/deployment/RestClientReactiveJsonbProcessor.java @@ -2,9 +2,20 @@ import static io.quarkus.deployment.Feature.REST_CLIENT_REACTIVE_JSONB; +import io.quarkus.arc.deployment.AdditionalBeanBuildItem; import io.quarkus.deployment.annotations.BuildProducer; import io.quarkus.deployment.annotations.BuildStep; import io.quarkus.deployment.builditem.FeatureBuildItem; +import io.quarkus.resteasy.reactive.jsonb.common.deployment.ResteasyReactiveJsonbCommonProcessor; +import io.quarkus.resteasy.reactive.spi.MessageBodyReaderBuildItem; +import io.quarkus.resteasy.reactive.spi.MessageBodyWriterBuildItem; +import java.util.Collections; +import java.util.List; +import javax.ws.rs.RuntimeType; +import javax.ws.rs.core.MediaType; +import org.jboss.resteasy.reactive.common.util.RestMediaType; +import org.jboss.resteasy.reactive.server.jsonb.JsonbMessageBodyReader; +import org.jboss.resteasy.reactive.server.jsonb.JsonbMessageBodyWriter; public class RestClientReactiveJsonbProcessor { @@ -12,4 +23,11 @@ public class RestClientReactiveJsonbProcessor { void feature(BuildProducer features) { features.produce(new FeatureBuildItem(REST_CLIENT_REACTIVE_JSONB)); } + + @BuildStep + void additionalProviders(BuildProducer additionalReaders, + BuildProducer additionalWriters) { + ResteasyReactiveJsonbCommonProcessor.additionalProviders(additionalReaders, additionalWriters, + RuntimeType.CLIENT); + } }