Properly segregate Json MessageBodyReader/Writer classes for server a…

…nd client Fixes: quarkusio#30089
geoand · Jan 3, 2023 · 9c41f33 · 9c41f33
1 parent 533f315
commit 9c41f33
Show file tree

Hide file tree

Showing 4 changed files with 49 additions and 12 deletions.
diff --git a/...arkus/resteasy/reactive/jsonb/common/deployment/ResteasyReactiveJsonbCommonProcessor.java b/...arkus/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<AdditionalBeanBuildItem> additionalBean,
-            BuildProducer<MessageBodyReaderBuildItem> additionalReaders,
-            BuildProducer<MessageBodyWriterBuildItem> additionalWriters) {
+    public void registerVertxJsonSupport(
+            BuildProducer<JsonbSerializerBuildItem> serializers,
+            BuildProducer<JsonbDeserializerBuildItem> deserializers) {
+        serializers.produce(new JsonbSerializerBuildItem(VERTX_SERIALIZERS));
+        deserializers.produce(new JsonbDeserializerBuildItem(VERTX_DESERIALIZERS));
+    }
+
+    @BuildStep
+    public void beans(BuildProducer<AdditionalBeanBuildItem> 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<MessageBodyReaderBuildItem> additionalReaders,
+            BuildProducer<MessageBodyWriterBuildItem> 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<JsonbSerializerBuildItem> serializers,
-            BuildProducer<JsonbDeserializerBuildItem> deserializers) {
-        serializers.produce(new JsonbSerializerBuildItem(VERTX_SERIALIZERS));
-        deserializers.produce(new JsonbDeserializerBuildItem(VERTX_DESERIALIZERS));
-    }
 }
diff --git a/...in/java/io/quarkus/resteasy/reactive/jsonb/deployment/ResteasyReactiveJsonbProcessor.java b/...in/java/io/quarkus/resteasy/reactive/jsonb/deployment/ResteasyReactiveJsonbProcessor.java
@@ -1,10 +1,15 @@
 package io.quarkus.resteasy.reactive.jsonb.deployment;
 
+import javax.ws.rs.RuntimeType;
+
 import io.quarkus.deployment.Feature;
 import io.quarkus.deployment.annotations.BuildProducer;
 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;
 
 public class ResteasyReactiveJsonbProcessor {
 
@@ -17,4 +22,11 @@ void feature(BuildProducer<FeatureBuildItem> feature) {
     ServerDefaultProducesHandlerBuildItem jsonDefault() {
         return ServerDefaultProducesHandlerBuildItem.json();
     }
+
+    @BuildStep
+    void additionalProviders(BuildProducer<MessageBodyReaderBuildItem> additionalReaders,
+            BuildProducer<MessageBodyWriterBuildItem> additionalWriters) {
+        ResteasyReactiveJsonbCommonProcessor.additionalProviders(additionalReaders, additionalWriters,
+                RuntimeType.SERVER);
+    }
 }
diff --git a/...ent/src/test/java/io/quarkus/resteasy/reactive/jsonb/deployment/test/sse/SseTestCase.java b/...ent/src/test/java/io/quarkus/resteasy/reactive/jsonb/deployment/test/sse/SseTestCase.java
@@ -14,6 +14,7 @@
 import java.util.concurrent.TimeUnit;
 import java.util.function.Consumer;
 
+import javax.json.bind.JsonbBuilder;
 import javax.ws.rs.client.Client;
 import javax.ws.rs.client.ClientBuilder;
 import javax.ws.rs.client.WebTarget;
@@ -24,6 +25,7 @@
 import org.apache.http.HttpStatus;
 import org.jboss.resteasy.reactive.client.impl.MultiInvoker;
 import org.jboss.resteasy.reactive.common.util.RestMediaType;
+import org.jboss.resteasy.reactive.server.jsonb.JsonbMessageBodyReader;
 import org.junit.jupiter.api.Test;
 import org.junit.jupiter.api.extension.RegisterExtension;
 
@@ -135,7 +137,7 @@ public void testStreamJsonMultiFromMulti() {
     }
 
     private void testJsonMulti(String path) {
-        Client client = ClientBuilder.newBuilder().build();
+        Client client = ClientBuilder.newBuilder().register(new JsonbMessageBodyReader(JsonbBuilder.create())).build();
         WebTarget target = client.target(uri.toString() + path);
         Multi<Message> multi = target.request().rx(MultiInvoker.class).get(Message.class);
         List<Message> list = multi.collect().asList().await().atMost(Duration.ofSeconds(30));

diff --git a/...va/io/quarkus/rest/client/reactive/jsonb/deployment/RestClientReactiveJsonbProcessor.java b/...va/io/quarkus/rest/client/reactive/jsonb/deployment/RestClientReactiveJsonbProcessor.java
@@ -2,14 +2,32 @@
 
 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 {
 
     @BuildStep
     void feature(BuildProducer<FeatureBuildItem> features) {
         features.produce(new FeatureBuildItem(REST_CLIENT_REACTIVE_JSONB));
     }
+
+    @BuildStep
+    void additionalProviders(BuildProducer<MessageBodyReaderBuildItem> additionalReaders,
+                             BuildProducer<MessageBodyWriterBuildItem> additionalWriters) {
+        ResteasyReactiveJsonbCommonProcessor.additionalProviders(additionalReaders, additionalWriters,
+                RuntimeType.CLIENT);
+    }
 }