Refinement and improvements.

Author: IvanPuntev

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

@@ -1,16 +1,13 @@
 package io.quarkiverse.loggingjson;
 
-import java.util.ArrayList;
-import java.util.List;
-import java.util.Optional;
+import java.util.*;
+import java.util.function.Supplier;
 import java.util.logging.Formatter;
 import java.util.stream.Collectors;
 
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
 
-import com.fasterxml.jackson.databind.ObjectMapper;
-
 import io.quarkiverse.loggingjson.config.Config;
 import io.quarkiverse.loggingjson.config.ConfigFormatter;
 import io.quarkiverse.loggingjson.jackson.JacksonJsonFactory;
@@ -24,7 +21,9 @@
 @Recorder
 public class LoggingJsonRecorder {
     private static final Logger log = LoggerFactory.getLogger(LoggingJsonRecorder.class);
-
+    private static final Map<Class<? extends JsonFactory>, Supplier<JsonFactory>> jsonFactories = Map.of(
+            JacksonJsonFactory.class, LoggingJsonRecorder::initializeJacksonJsonFactory,
+            JsonbJsonFactory.class, JsonbJsonFactory::new);
     private final RuntimeValue<Config> config;
 
     public LoggingJsonRecorder(RuntimeValue<Config> config) {
@@ -48,7 +47,7 @@ public RuntimeValue<Optional<Formatter>> initializeJsonLogging(ConfigFormatter f
         if (formatter == null || !formatter.isEnabled()) {
             return new RuntimeValue<>(Optional.empty());
         }
-        JsonFactory jsonFactory = initializeJsonFactory(jsonFactoryClass);
+        JsonFactory jsonFactory = getJsonFactory(jsonFactoryClass);
         jsonFactory.setConfig(config);
 
         List<JsonProvider> providers;
@@ -79,17 +78,21 @@ public RuntimeValue<Optional<Formatter>> initializeJsonLogging(ConfigFormatter f
         return new RuntimeValue<>(Optional.of(new JsonFormatter(providers, jsonFactory, config)));
     }
 
-    private JsonFactory initializeJsonFactory(Class<? extends JsonFactory> jsonFactoryType) {
-        if (jsonFactoryType == JacksonJsonFactory.class) {
-            ObjectMapperProvider objectMapperProvider = Arc.container().instance(ObjectMapperProvider.class).get();
-            ObjectMapper objectMapper = objectMapperProvider.get();
-            return new JacksonJsonFactory(objectMapper);
-        } else if (jsonFactoryType == JsonbJsonFactory.class) {
-            return new JsonbJsonFactory();
-        } else {
-            throw new RuntimeException(
-                    "Missing json implementation to use for logging-json. Supported: [quarkus-jackson, quarkus-jsonb]");
+    private JsonFactory getJsonFactory(Class<? extends JsonFactory> jsonFactoryType) {
+        Supplier<JsonFactory> jsonFactorySupplier = jsonFactories.get(jsonFactoryType);
+        if (jsonFactorySupplier == null) {
+            throw new IllegalArgumentException("Unsupported json factory type: " + jsonFactoryType);
+        }
+        return jsonFactorySupplier.get();
+    }
+
+    private static JacksonJsonFactory initializeJacksonJsonFactory() {
+        ObjectMapperProvider objectMapperProvider = Arc.container().instance(ObjectMapperProvider.class).orElse(null);
+        if (objectMapperProvider != null) {
+            return new JacksonJsonFactory(objectMapperProvider.get());
         }
+        log.warn("ObjectMapperProvider not found, falling back to default ObjectMapper.");
+        return new JacksonJsonFactory();
     }
 
     private List<JsonProvider> defaultFormat(Config config) {