Merge pull request #5094 from tsegismont/no-pretty-mapper-internally

ObjectMapper configuration should apply when pretty printing

Author: vietj

src/main/java/io/vertx/core/json/jackson/DatabindCodec.java

@@ -37,19 +37,18 @@ public class DatabindCodec extends JacksonCodec {
   private static final ObjectMapper prettyMapper = new ObjectMapper();
 
   static {
-    initialize();
+    initialize(mapper, false);
+    initialize(prettyMapper, true);
   }
 
-  private static void initialize() {
+  private static void initialize(ObjectMapper om, boolean prettyPrint) {
     // Non-standard JSON but we allow C style comments in our JSON
-    mapper.configure(JsonParser.Feature.ALLOW_COMMENTS, true);
-
-    prettyMapper.configure(JsonParser.Feature.ALLOW_COMMENTS, true);
-    prettyMapper.configure(SerializationFeature.INDENT_OUTPUT, true);
-
+    om.configure(JsonParser.Feature.ALLOW_COMMENTS, true);
+    if (prettyPrint) {
+      om.configure(SerializationFeature.INDENT_OUTPUT, true);
+    }
     VertxModule module = new VertxModule();
-    mapper.registerModule(module);
-    prettyMapper.registerModule(module);
+    om.registerModule(module);
   }
 
   /**
@@ -157,8 +156,13 @@ private static <T> T fromParser(JsonParser parser, TypeReference<T> type) throws
   @Override
   public String toString(Object object, boolean pretty) throws EncodeException {
     try {
-      ObjectMapper mapper = pretty ? DatabindCodec.prettyMapper : DatabindCodec.mapper;
-      return mapper.writeValueAsString(object);
+      String result;
+      if (pretty) {
+        result = mapper.writerWithDefaultPrettyPrinter().writeValueAsString(object);
+      } else {
+        result = mapper.writeValueAsString(object);
+      }
+      return result;
     } catch (Exception e) {
       throw new EncodeException("Failed to encode as JSON: " + e.getMessage());
     }
@@ -167,8 +171,13 @@ public String toString(Object object, boolean pretty) throws EncodeException {
   @Override
   public Buffer toBuffer(Object object, boolean pretty) throws EncodeException {
     try {
-      ObjectMapper mapper = pretty ? DatabindCodec.prettyMapper : DatabindCodec.mapper;
-      return Buffer.buffer(mapper.writeValueAsBytes(object));
+      byte[] result;
+      if (pretty) {
+        result = mapper.writerWithDefaultPrettyPrinter().writeValueAsBytes(object);
+      } else {
+        result = mapper.writeValueAsBytes(object);
+      }
+      return Buffer.buffer(result);
     } catch (Exception e) {
       throw new EncodeException("Failed to encode as JSON: " + e.getMessage());
     }

src/test/java/io/vertx/core/json/JacksonDatabindTest.java

@@ -14,6 +14,9 @@
 import com.fasterxml.jackson.annotation.JsonProperty;
 import com.fasterxml.jackson.core.type.TypeReference;
 import com.fasterxml.jackson.databind.ObjectMapper;
+import com.fasterxml.jackson.databind.SerializationConfig;
+import com.fasterxml.jackson.databind.SerializationFeature;
+import io.vertx.core.ThreadingModel;
 import io.vertx.core.buffer.Buffer;
 import io.vertx.core.json.jackson.DatabindCodec;
 import io.vertx.core.json.jackson.JacksonCodec;
@@ -108,4 +111,20 @@ private static class Pojo {
     @JsonProperty
     byte[] bytes;
   }
+
+  @Test
+  public void testObjectMapperConfigAppliesToPrettyPrinting() {
+    ObjectMapper om = DatabindCodec.mapper();
+    SerializationConfig sc = om.getSerializationConfig();
+    assertNotNull(sc);
+    try {
+      om.setConfig(sc.with(SerializationFeature.WRITE_ENUMS_USING_INDEX));
+      ThreadingModel vt = ThreadingModel.VIRTUAL_THREAD;
+      String expected = String.valueOf(vt.ordinal());
+      assertEquals(expected, Json.encodePrettily(vt));
+      assertEquals(expected, Json.encode(vt));
+    } finally {
+      om.setConfig(sc);
+    }
+  }
 }