Extract createJsonFactory in the LoggingJsonRecorder class

Author: ivelinyanev-ship-cars

deployment/src/main/java/io/quarkiverse/loggingjson/deployment/LoggingJsonProcessor.java

@@ -4,11 +4,9 @@
 
 import org.jboss.jandex.ClassInfo;
 
-import io.quarkiverse.loggingjson.JsonFactory;
+import io.quarkiverse.loggingjson.JsonFactoryType;
 import io.quarkiverse.loggingjson.LoggingJsonRecorder;
 import io.quarkiverse.loggingjson.config.Config;
-import io.quarkiverse.loggingjson.jackson.JacksonJsonFactory;
-import io.quarkiverse.loggingjson.jsonb.JsonbJsonFactory;
 import io.quarkus.arc.deployment.AdditionalBeanBuildItem;
 import io.quarkus.deployment.Capabilities;
 import io.quarkus.deployment.Capability;
@@ -34,29 +32,30 @@ FeatureBuildItem feature() {
     @Record(ExecutionTime.RUNTIME_INIT)
     LogConsoleFormatBuildItem setUpConsoleFormatter(Capabilities capabilities, LoggingJsonRecorder recorder,
             Config config) {
+        JsonFactoryType factoryType = determineJsonFactoryType(capabilities);
+
         return new LogConsoleFormatBuildItem(
-                recorder.initializeConsoleJsonLogging(config, jsonFactory(capabilities, config)));
+                recorder.initializeConsoleJsonLogging(config, factoryType));
     }
 
     @BuildStep
     @Record(ExecutionTime.RUNTIME_INIT)
     LogFileFormatBuildItem setUpFileFormatter(Capabilities capabilities, LoggingJsonRecorder recorder,
             Config config) {
+        JsonFactoryType factoryType = determineJsonFactoryType(capabilities);
+
         return new LogFileFormatBuildItem(
-                recorder.initializeFileJsonLogging(config, jsonFactory(capabilities, config)));
+                recorder.initializeFileJsonLogging(config, factoryType));
     }
 
-    private JsonFactory jsonFactory(Capabilities capabilities, Config config) {
-
+    private JsonFactoryType determineJsonFactoryType(Capabilities capabilities) {
         if (capabilities.isPresent(Capability.JACKSON)) {
-            boolean enabledJavaTimeModule = config.enabledJavaTimeModule.orElse(false);
-
-            return new JacksonJsonFactory(enabledJavaTimeModule);
+            return JsonFactoryType.JACKSON;
         } else if (capabilities.isPresent(Capability.JSONB)) {
-            return new JsonbJsonFactory();
+            return JsonFactoryType.JSONB;
         } else {
             throw new RuntimeException(
-                    "Missing json implementation to use for logging-json. Supported: [quarkus-jackson, quarkus-jsonb]");
+                    "Missing JSON implementation to use for logging-json. Supported: [quarkus-jackson, quarkus-jsonb]");
         }
     }
 

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

@@ -11,6 +11,8 @@
 
 import io.quarkiverse.loggingjson.config.Config;
 import io.quarkiverse.loggingjson.config.ConfigFormatter;
+import io.quarkiverse.loggingjson.jackson.JacksonJsonFactory;
+import io.quarkiverse.loggingjson.jsonb.JsonbJsonFactory;
 import io.quarkiverse.loggingjson.providers.*;
 import io.quarkus.arc.Arc;
 import io.quarkus.arc.InjectableInstance;
@@ -21,19 +23,21 @@
 public class LoggingJsonRecorder {
     private static final Logger log = LoggerFactory.getLogger(LoggingJsonRecorder.class);
 
-    public RuntimeValue<Optional<Formatter>> initializeConsoleJsonLogging(Config config,
-            JsonFactory jsonFactory) {
+    public RuntimeValue<Optional<Formatter>> initializeConsoleJsonLogging(Config config, JsonFactoryType factoryType) {
+        JsonFactory jsonFactory = createJsonFactory(factoryType, config);
+
         return initializeJsonLogging(config.console, config, jsonFactory);
     }
 
-    public RuntimeValue<Optional<Formatter>> initializeFileJsonLogging(Config config,
-            JsonFactory jsonFactory) {
+    public RuntimeValue<Optional<Formatter>> initializeFileJsonLogging(Config config, JsonFactoryType factoryType) {
+        JsonFactory jsonFactory = createJsonFactory(factoryType, config);
+
         return initializeJsonLogging(config.file, config, jsonFactory);
     }
 
     public RuntimeValue<Optional<Formatter>> initializeJsonLogging(ConfigFormatter formatter, Config config,
             JsonFactory jsonFactory) {
-        if (formatter == null || !formatter.isEnabled()) {
+        if (formatter == null || !formatter.isEnabled() || jsonFactory == null) {
             return new RuntimeValue<>(Optional.empty());
         }
 
@@ -66,6 +70,18 @@ public RuntimeValue<Optional<Formatter>> initializeJsonLogging(ConfigFormatter f
 
     }
 
+    private JsonFactory createJsonFactory(JsonFactoryType type, Config config) {
+        switch (type) {
+            case JACKSON:
+                return new JacksonJsonFactory(config.enabledJavaTimeModule.orElse(false));
+            case JSONB:
+                return new JsonbJsonFactory();
+            default:
+                log.error("Unsupported JsonFactory type");
+                return null;
+        }
+    }
+
     private List<JsonProvider> defaultFormat(Config config) {
         List<JsonProvider> providers = new ArrayList<>();
         providers.add(new TimestampJsonProvider(config.fields.timestamp));