Implemented prettyPrint (#388)

* Implemented prettyPrint

Author: SlyngDK

runtime/src/main/java/io/quarkiverse/loggingjson/JsonFactory.java

@@ -2,7 +2,10 @@
 
 import java.io.IOException;
 
+import io.quarkiverse.loggingjson.config.Config;
+
 public interface JsonFactory {
+    void setConfig(Config config);
 
     JsonGenerator createGenerator(StringBuilderWriter writer) throws IOException;
 }

runtime/src/main/java/io/quarkiverse/loggingjson/LoggingJsonRecorder.java

@@ -44,6 +44,7 @@ public RuntimeValue<Optional<Formatter>> initializeJsonLogging(ConfigFormatter f
         if (formatter == null || !formatter.isEnabled()) {
             return new RuntimeValue<>(Optional.empty());
         }
+        jsonFactory.setConfig(config);
 
         List<JsonProvider> providers;
 
@@ -71,7 +72,6 @@ public RuntimeValue<Optional<Formatter>> initializeJsonLogging(ConfigFormatter f
         }
 
         return new RuntimeValue<>(Optional.of(new JsonFormatter(providers, jsonFactory, config)));
-
     }
 
     private List<JsonProvider> defaultFormat(Config config) {

runtime/src/main/java/io/quarkiverse/loggingjson/jackson/JacksonJsonFactory.java

@@ -3,22 +3,24 @@
 import java.io.IOException;
 import java.util.ServiceConfigurationError;
 
+import com.fasterxml.jackson.core.JsonFactoryBuilder;
 import com.fasterxml.jackson.databind.ObjectMapper;
 import com.fasterxml.jackson.databind.SerializationFeature;
 
 import io.quarkiverse.loggingjson.JsonFactory;
 import io.quarkiverse.loggingjson.JsonGenerator;
 import io.quarkiverse.loggingjson.StringBuilderWriter;
+import io.quarkiverse.loggingjson.config.Config;
 
 public class JacksonJsonFactory implements JsonFactory {
 
-    private final com.fasterxml.jackson.core.JsonFactory jsonFactory;
+    private com.fasterxml.jackson.core.JsonFactory jsonFactory;
 
     public JacksonJsonFactory() {
-        jsonFactory = createJsonFactory();
+        jsonFactory = createJsonFactory(false);
     }
 
-    private com.fasterxml.jackson.core.JsonFactory createJsonFactory() {
+    private com.fasterxml.jackson.core.JsonFactory createJsonFactory(boolean prettyPrint) {
         ObjectMapper objectMapper = new ObjectMapper()
                 /*
                  * Assume empty beans are ok.
@@ -30,28 +32,25 @@ private com.fasterxml.jackson.core.JsonFactory createJsonFactory() {
         } catch (ServiceConfigurationError serviceConfigurationError) {
             // TODO Fix output of error message
 
-            //                addError("Error occurred while dynamically loading jackson modules", serviceConfigurationError);
             System.err.println("Error occurred while dynamically loading jackson modules");
             serviceConfigurationError.printStackTrace();
         }
 
-        return objectMapper
-                .getFactory()
-                /*
-                 * When generators are flushed, don't flush the underlying outputStream.
-                 *
-                 * This allows some streaming optimizations when using an encoder.
-                 *
-                 * The encoder generally determines when the stream should be flushed
-                 * by an 'immediateFlush' property.
-                 *
-                 * The 'immediateFlush' property of the encoder can be set to false
-                 * when the appender performs the flushes at appropriate times
-                 * (such as the end of a batch in the AbstractLogstashTcpSocketAppender).
-                 */
+        final JsonFactoryBuilder builder = new JsonFactoryBuilder(objectMapper.getFactory());
+        if (prettyPrint) {
+            builder.addDecorator((factory, generator) -> generator.useDefaultPrettyPrinter());
+        }
+        return builder
+                .build()
+                .setCodec(objectMapper)
                 .disable(com.fasterxml.jackson.core.JsonGenerator.Feature.FLUSH_PASSED_TO_STREAM);
     }
 
+    @Override
+    public void setConfig(Config config) {
+        jsonFactory = createJsonFactory(config.prettyPrint());
+    }
+
     @Override
     public JsonGenerator createGenerator(StringBuilderWriter writer) throws IOException {
         return new JacksonJsonGenerator(jsonFactory.createGenerator(writer));

runtime/src/main/java/io/quarkiverse/loggingjson/jsonb/JsonbJsonFactory.java

@@ -1,6 +1,7 @@
 package io.quarkiverse.loggingjson.jsonb;
 
 import java.util.HashMap;
+import java.util.Map;
 
 import jakarta.json.Json;
 import jakarta.json.stream.JsonGeneratorFactory;
@@ -11,14 +12,24 @@
 import io.quarkiverse.loggingjson.JsonFactory;
 import io.quarkiverse.loggingjson.JsonGenerator;
 import io.quarkiverse.loggingjson.StringBuilderWriter;
+import io.quarkiverse.loggingjson.config.Config;
 
 public class JsonbJsonFactory implements JsonFactory {
 
-    private final JsonGeneratorFactory factory;
-    private final YassonJsonb jsonb;
+    private JsonGeneratorFactory factory;
+    private YassonJsonb jsonb;
 
     public JsonbJsonFactory() {
-        factory = Json.createGeneratorFactory(new HashMap<>());
+        setConfig(null);
+    }
+
+    @Override
+    public void setConfig(Config config) {
+        Map<String, Object> jsonConfig = new HashMap<>();
+        if (config != null && config.prettyPrint()) {
+            jsonConfig.put(jakarta.json.stream.JsonGenerator.PRETTY_PRINTING, Boolean.TRUE);
+        }
+        factory = Json.createGeneratorFactory(jsonConfig);
         jsonb = (YassonJsonb) new JsonBindingBuilder().build();
     }
 

runtime/src/test/java/io/quarkiverse/loggingjson/JsonFormatterJacksonTest.java

@@ -0,0 +1,14 @@
+package io.quarkiverse.loggingjson;
+
+class JsonFormatterJacksonTest extends JsonFormatterJsonbTest {
+
+    public JsonFormatterJacksonTest() {
+        expectedPrettyPrintMessage = "{\n  \"message\" : \"TestMessage\"\n}\n";
+    }
+
+    @Override
+    protected Type type() {
+        return Type.JACKSON;
+    }
+
+}

runtime/src/test/java/io/quarkiverse/loggingjson/JsonFormatterJsonbTest.java

@@ -0,0 +1,53 @@
+package io.quarkiverse.loggingjson;
+
+import java.util.List;
+import java.util.Map;
+import java.util.logging.Level;
+
+import org.jboss.logmanager.ExtLogRecord;
+import org.junit.jupiter.api.Assertions;
+import org.junit.jupiter.api.Test;
+
+import io.quarkiverse.loggingjson.config.Config;
+import io.quarkiverse.loggingjson.providers.JsonProviderBaseTest;
+import io.quarkiverse.loggingjson.providers.MessageJsonProvider;
+
+class JsonFormatterJsonbTest extends JsonProviderBaseTest {
+
+    protected String expectedPrettyPrintMessage = "{\n    \"message\": \"TestMessage\"\n}\n";
+
+    @Override
+    protected Type type() {
+        return Type.JSONB;
+    }
+
+    @Test
+    void format() {
+        final Config config = GetConfig(Map.of());
+
+        final JsonFormatter formatter = new JsonFormatter(List.of(new MessageJsonProvider(config.fields().message())),
+                getJsonFactory(config), config);
+
+        final ExtLogRecord event = new ExtLogRecord(Level.ALL, "TestMessage", "");
+        final String formatted = formatter.format(event);
+
+        Assertions.assertNotNull(formatted);
+        Assertions.assertFalse(formatted.isEmpty());
+        Assertions.assertEquals("{\"message\":\"TestMessage\"}\n", formatted);
+    }
+
+    @Test
+    void formatPrettyPrint() {
+        final Config config = GetConfig(Map.of("quarkus.log.json.pretty-print", "true"));
+
+        final JsonFormatter formatter = new JsonFormatter(List.of(new MessageJsonProvider(config.fields().message())),
+                getJsonFactory(config), config);
+
+        final ExtLogRecord event = new ExtLogRecord(Level.ALL, "TestMessage", "");
+        final String formatted = formatter.format(event);
+
+        Assertions.assertNotNull(formatted);
+        Assertions.assertFalse(formatted.isEmpty());
+        Assertions.assertEquals(expectedPrettyPrintMessage, formatted);
+    }
+}

runtime/src/test/java/io/quarkiverse/loggingjson/providers/JsonProviderBaseTest.java

@@ -1,6 +1,7 @@
 package io.quarkiverse.loggingjson.providers;
 
 import java.io.IOException;
+import java.util.Map;
 import java.util.Optional;
 
 import org.jboss.logmanager.ExtLogRecord;
@@ -15,28 +16,42 @@
 import io.quarkiverse.loggingjson.config.Config;
 import io.quarkiverse.loggingjson.jackson.JacksonJsonFactory;
 import io.quarkiverse.loggingjson.jsonb.JsonbJsonFactory;
+import io.smallrye.config.SmallRyeConfigBuilder;
+import io.smallrye.config.common.MapBackedConfigSource;
 
-abstract class JsonProviderBaseTest {
+public abstract class JsonProviderBaseTest {
 
-    private static final JsonFactory jsonb = new JsonbJsonFactory();
-    private static final JsonFactory jackson = new JacksonJsonFactory();
     private static final ObjectMapper mapper = new ObjectMapper();
 
     protected abstract Type type();
 
-    private JsonFactory getJsonFactory() {
+    protected static Config GetConfig(Map<String, String> values) {
+        return new SmallRyeConfigBuilder()
+                .withMapping(Config.class)
+                .withSources(new MapBackedConfigSource("test", values) {
+                })
+                .build()
+                .getConfigMapping(Config.class);
+    }
+
+    protected JsonFactory getJsonFactory(Config config) {
+        JsonFactory jsonFactory;
         switch (type()) {
             case JSONB:
-                return jsonb;
+                jsonFactory = new JsonbJsonFactory();
+                break;
             case JACKSON:
-                return jackson;
+                jsonFactory = new JacksonJsonFactory();
+                break;
             default:
                 throw new RuntimeException("Unsupported type");
         }
+        jsonFactory.setConfig(config);
+        return jsonFactory;
     }
 
     protected JsonGenerator getGenerator(StringBuilderWriter writer) throws IOException {
-        return getJsonFactory().createGenerator(writer);
+        return getJsonFactory(GetConfig(Map.of())).createGenerator(writer);
     }
 
     protected String getResult(JsonProvider jsonProvider, ExtLogRecord event) throws IOException {