Merge pull request #39615 from geoand/#39599

Allow JsonObject and JsonArray to be used in any POJO for JSON handling
quarkusio · Mar 26, 2024 · 92a4151 · 92a4151
2 parents 316f8b7 + 70727f1
commit 92a4151
Show file tree

Hide file tree

Showing 11 changed files with 148 additions and 5 deletions.
diff --git a/...src/test/java/io/quarkus/resteasy/reactive/jackson/deployment/test/VertxJsonEndpoint.java b/...src/test/java/io/quarkus/resteasy/reactive/jackson/deployment/test/VertxJsonEndpoint.java
@@ -27,6 +27,20 @@ public JsonObject jsonObject(JsonObject input) {
         return result;
     }
 
+    @POST
+    @Path("jsonObjectWrapper")
+    @Produces(MediaType.APPLICATION_JSON)
+    @Consumes(MediaType.APPLICATION_JSON)
+    public JsonObjectWrapper jsonObjectWrapper(JsonObjectWrapper wrapper) {
+        var payload = wrapper.payload;
+        JsonObject result = new JsonObject();
+        result.put("name", payload.getString("name"));
+        result.put("age", 50);
+        result.put("nested", new JsonObject(Collections.singletonMap("foo", "bar")));
+        result.put("bools", new JsonArray().add(true));
+        return new JsonObjectWrapper(result);
+    }
+
     @POST
     @Path("jsonArray")
     @Produces(MediaType.APPLICATION_JSON)
@@ -36,4 +50,22 @@ public JsonArray jsonArray(JsonArray input) {
         result.add("last");
         return result;
     }
+
+    @POST
+    @Path("jsonArrayWrapper")
+    @Produces(MediaType.APPLICATION_JSON)
+    @Consumes(MediaType.APPLICATION_JSON)
+    public JsonArrayWrapper jsonArrayWrapper(JsonArrayWrapper wrapper) {
+        var payload = wrapper.payload;
+        JsonArray result = payload.copy();
+        result.add("last");
+        return new JsonArrayWrapper(result);
+    }
+
+    public record JsonObjectWrapper(JsonObject payload) {
+    }
+
+    public record JsonArrayWrapper(JsonArray payload) {
+
+    }
 }
diff --git a/...ent/src/test/java/io/quarkus/resteasy/reactive/jackson/deployment/test/VertxJsonTest.java b/...ent/src/test/java/io/quarkus/resteasy/reactive/jackson/deployment/test/VertxJsonTest.java
@@ -38,6 +38,21 @@ public void testJsonObject() {
                 .body("bools[0]", Matchers.equalTo(true));
     }
 
+    @Test
+    public void testJsonObjectWrapper() {
+        RestAssured.with()
+                .body("{\"payload\": {\"name\": \"Bob\"}}")
+                .contentType("application/json")
+                .post("/vertx/jsonObjectWrapper")
+                .then()
+                .statusCode(200)
+                .contentType("application/json")
+                .body("payload.name", Matchers.equalTo("Bob"))
+                .body("payload.age", Matchers.equalTo(50))
+                .body("payload.nested.foo", Matchers.equalTo("bar"))
+                .body("payload.bools[0]", Matchers.equalTo(true));
+    }
+
     @Test
     public void testJsonArray() {
         RestAssured.with()
@@ -51,4 +66,17 @@ public void testJsonArray() {
                 .body("[1]", Matchers.equalTo("last"));
     }
 
+    @Test
+    public void testJsonArrayWrapper() {
+        RestAssured.with()
+                .body("{\"payload\": [\"first\"]}")
+                .contentType("application/json")
+                .post("/vertx/jsonArrayWrapper")
+                .then()
+                .statusCode(200)
+                .contentType("application/json")
+                .body("payload[0]", Matchers.equalTo("first"))
+                .body("payload[1]", Matchers.equalTo("last"));
+    }
+
 }
diff --git a/extensions/vertx/deployment/pom.xml b/extensions/vertx/deployment/pom.xml
@@ -33,6 +33,10 @@
             <groupId>io.quarkus</groupId>
             <artifactId>quarkus-mutiny-deployment</artifactId>
         </dependency>
+        <dependency>
+            <groupId>io.quarkus</groupId>
+            <artifactId>quarkus-jackson-spi</artifactId>
+        </dependency>
         <dependency>
             <groupId>io.quarkus</groupId>
             <artifactId>quarkus-junit5-internal</artifactId>

diff --git a/...nsions/vertx/deployment/src/main/java/io/quarkus/vertx/deployment/VertxJsonProcessor.java b/...nsions/vertx/deployment/src/main/java/io/quarkus/vertx/deployment/VertxJsonProcessor.java
@@ -6,6 +6,13 @@
 import io.quarkus.deployment.annotations.BuildStep;
 import io.quarkus.deployment.builditem.nativeimage.RuntimeReinitializedClassBuildItem;
 import io.quarkus.deployment.builditem.nativeimage.ServiceProviderBuildItem;
+import io.quarkus.jackson.spi.JacksonModuleBuildItem;
+import io.quarkus.vertx.runtime.jackson.JsonArrayDeserializer;
+import io.quarkus.vertx.runtime.jackson.JsonArraySerializer;
+import io.quarkus.vertx.runtime.jackson.JsonObjectDeserializer;
+import io.quarkus.vertx.runtime.jackson.JsonObjectSerializer;
+import io.vertx.core.json.JsonArray;
+import io.vertx.core.json.JsonObject;
 import io.vertx.core.spi.JsonFactory;
 
 public class VertxJsonProcessor {
@@ -24,4 +31,16 @@ void nativeSupport(List<ReinitializeVertxJsonBuildItem> reinitializeVertxJson,
         serviceProviderBuildItemBuildProducer
                 .produce(ServiceProviderBuildItem.allProvidersFromClassPath(JsonFactory.class.getName()));
     }
+
+    @BuildStep
+    JacksonModuleBuildItem registerJacksonSerDeser() {
+        return new JacksonModuleBuildItem.Builder("VertxTypes")
+                .add(JsonArraySerializer.class.getName(),
+                        JsonArrayDeserializer.class.getName(),
+                        JsonArray.class.getName())
+                .add(JsonObjectSerializer.class.getName(),
+                        JsonObjectDeserializer.class.getName(),
+                        JsonObject.class.getName())
+                .build();
+    }
 }
diff --git a/...ions/vertx/runtime/src/main/java/io/quarkus/vertx/runtime/jackson/BufferDeserializer.java b/...ions/vertx/runtime/src/main/java/io/quarkus/vertx/runtime/jackson/BufferDeserializer.java
@@ -25,7 +25,7 @@
 /**
  * Copied from {@code io.vertx.core.json.jackson.BufferDeserializer} as that class is package private
  */
-class BufferDeserializer extends JsonDeserializer<Buffer> {
+public class BufferDeserializer extends JsonDeserializer<Buffer> {
 
     @Override
     public Buffer deserialize(JsonParser p, DeserializationContext ctxt) throws IOException, JsonProcessingException {

diff --git a/...nsions/vertx/runtime/src/main/java/io/quarkus/vertx/runtime/jackson/BufferSerializer.java b/...nsions/vertx/runtime/src/main/java/io/quarkus/vertx/runtime/jackson/BufferSerializer.java
@@ -23,7 +23,7 @@
 /**
  * Copied from {@code io.vertx.core.json.jackson.BufferSerializer} as that class is package private
  */
-class BufferSerializer extends JsonSerializer<Buffer> {
+public class BufferSerializer extends JsonSerializer<Buffer> {
 
     @Override
     public void serialize(Buffer value, JsonGenerator jgen, SerializerProvider provider) throws IOException {

diff --git a/...s/vertx/runtime/src/main/java/io/quarkus/vertx/runtime/jackson/JsonArrayDeserializer.java b/...s/vertx/runtime/src/main/java/io/quarkus/vertx/runtime/jackson/JsonArrayDeserializer.java
@@ -0,0 +1,30 @@
+package io.quarkus.vertx.runtime.jackson;
+
+import java.util.List;
+
+import com.fasterxml.jackson.databind.JavaType;
+import com.fasterxml.jackson.databind.JsonDeserializer;
+import com.fasterxml.jackson.databind.deser.std.StdDelegatingDeserializer;
+import com.fasterxml.jackson.databind.util.Converter;
+import com.fasterxml.jackson.databind.util.StdConverter;
+
+import io.vertx.core.json.JsonArray;
+
+public class JsonArrayDeserializer extends StdDelegatingDeserializer<JsonArray> {
+
+    public JsonArrayDeserializer() {
+        super(new StdConverter<List<?>, JsonArray>() {
+            @Override
+            public JsonArray convert(List list) {
+                return new JsonArray(list);
+            }
+        });
+    }
+
+    @Override
+    protected StdDelegatingDeserializer<JsonArray> withDelegate(Converter<Object, JsonArray> converter,
+            JavaType delegateType,
+            JsonDeserializer<?> delegateDeserializer) {
+        return new StdDelegatingDeserializer<>(converter, delegateType, delegateDeserializer);
+    }
+}
diff --git a/...ons/vertx/runtime/src/main/java/io/quarkus/vertx/runtime/jackson/JsonArraySerializer.java b/...ons/vertx/runtime/src/main/java/io/quarkus/vertx/runtime/jackson/JsonArraySerializer.java
@@ -22,7 +22,7 @@
 /**
  * Copied from {@code io.vertx.core.json.jackson.JsonArraySerializer} as that class is package private
  */
-class JsonArraySerializer extends JsonSerializer<JsonArray> {
+public class JsonArraySerializer extends JsonSerializer<JsonArray> {
     @Override
     public void serialize(JsonArray value, JsonGenerator jgen, SerializerProvider provider) throws IOException {
         jgen.writeObject(value.getList());

diff --git a/.../vertx/runtime/src/main/java/io/quarkus/vertx/runtime/jackson/JsonObjectDeserializer.java b/.../vertx/runtime/src/main/java/io/quarkus/vertx/runtime/jackson/JsonObjectDeserializer.java
@@ -0,0 +1,30 @@
+package io.quarkus.vertx.runtime.jackson;
+
+import java.util.Map;
+
+import com.fasterxml.jackson.databind.JavaType;
+import com.fasterxml.jackson.databind.JsonDeserializer;
+import com.fasterxml.jackson.databind.deser.std.StdDelegatingDeserializer;
+import com.fasterxml.jackson.databind.util.Converter;
+import com.fasterxml.jackson.databind.util.StdConverter;
+
+import io.vertx.core.json.JsonObject;
+
+public class JsonObjectDeserializer extends StdDelegatingDeserializer<JsonObject> {
+
+    public JsonObjectDeserializer() {
+        super(new StdConverter<Map<?, ?>, JsonObject>() {
+            @Override
+            public JsonObject convert(Map map) {
+                return new JsonObject(map);
+            }
+        });
+    }
+
+    @Override
+    protected StdDelegatingDeserializer<JsonObject> withDelegate(Converter<Object, JsonObject> converter,
+            JavaType delegateType,
+            JsonDeserializer<?> delegateDeserializer) {
+        return new StdDelegatingDeserializer<>(converter, delegateType, delegateDeserializer);
+    }
+}
diff --git a/...ns/vertx/runtime/src/main/java/io/quarkus/vertx/runtime/jackson/JsonObjectSerializer.java b/...ns/vertx/runtime/src/main/java/io/quarkus/vertx/runtime/jackson/JsonObjectSerializer.java
@@ -21,7 +21,7 @@
 /**
  * Copied from {@code io.vertx.core.json.jackson.JsonObjectSerializer} as that class is package private
  */
-class JsonObjectSerializer extends JsonSerializer<JsonObject> {
+public class JsonObjectSerializer extends JsonSerializer<JsonObject> {
     @Override
     public void serialize(JsonObject value, JsonGenerator jgen, SerializerProvider provider) throws IOException {
         jgen.writeObject(value.getMap());

diff --git a/...ation-tests/jpa-postgresql/src/test/resources/image-metrics/23.1/image-metrics.properties b/...ation-tests/jpa-postgresql/src/test/resources/image-metrics/23.1/image-metrics.properties
@@ -7,7 +7,7 @@ analysis_results.methods.reachable=96465
 analysis_results.methods.reachable.tolerance=3
 analysis_results.fields.reachable=27025
 analysis_results.fields.reachable.tolerance=3
-analysis_results.types.reflection=6048
+analysis_results.types.reflection=6100
 analysis_results.types.reflection.tolerance=3
 analysis_results.methods.reflection=4707
 analysis_results.methods.reflection.tolerance=3