fix: fix cdi-log npe during the start of the application (#23)

1000kit · Oct 26, 2022 · 745f4cc · 745f4cc
1 parent f3e675c
commit 745f4cc
Show file tree

Hide file tree

Showing 2 changed files with 8 additions and 8 deletions.
diff --git a/extensions/log/cdi/runtime/src/main/java/org/tkit/quarkus/log/cdi/LogRecorder.java b/extensions/log/cdi/runtime/src/main/java/org/tkit/quarkus/log/cdi/LogRecorder.java
@@ -1,7 +1,6 @@
 package org.tkit.quarkus.log.cdi;
 
 import java.util.List;
-import java.util.stream.Collectors;
 
 import javax.enterprise.inject.Any;
 
@@ -22,14 +21,14 @@ public class LogRecorder {
 
     private static final Logger log = LoggerFactory.getLogger(LogRecorder.class);
 
-    static LogRuntimeConfig CONFIG;
+    static LogRuntimeConfig CONFIG = new LogRuntimeConfig();
 
-    static ServiceValue SERVICE;
+    static ServiceValue SERVICE = new ServiceValue();
 
     public void init(ServiceValue values, LogRuntimeConfig config) {
 
         InjectableInstance<LogParam> it = Arc.container().select(LogParam.class, Any.Literal.INSTANCE);
-        LogParamValueService.init(it.stream().collect(Collectors.toList()));
+        LogParamValueService.init(it.stream());
 
         CONFIG = config;
         SERVICE = values;

diff --git a/.../cdi/runtime/src/main/java/org/tkit/quarkus/log/cdi/interceptor/LogParamValueService.java b/.../cdi/runtime/src/main/java/org/tkit/quarkus/log/cdi/interceptor/LogParamValueService.java
@@ -3,6 +3,7 @@
 import java.util.*;
 import java.util.concurrent.ConcurrentHashMap;
 import java.util.function.Function;
+import java.util.stream.Stream;
 
 import org.tkit.quarkus.log.cdi.LogParam;
 
@@ -22,18 +23,18 @@ public class LogParamValueService {
     public static Map<Class<?>, Function<Object, String>> ASSIGNABLE_FROM = new HashMap<>(
             JavaTypesLogParamValue.assignableFrom());
 
-    public static void init(List<LogParam> services) {
-        if (services != null && !services.isEmpty()) {
+    public static void init(Stream<LogParam> services) {
+        if (services != null) {
             Map<Class<?>, LogParam.Item> classes = new HashMap<>();
             Map<Class<?>, LogParam.Item> assignable = new HashMap<>();
-            for (LogParam def : services) {
+            services.forEach(def -> {
                 if (def.getClasses() != null) {
                     map(def.getClasses(), classes);
                 }
                 if (def.getAssignableFrom() != null) {
                     map(def.getAssignableFrom(), assignable);
                 }
-            }
+            });
             classes.forEach((c, item) -> CLASSES.put(c, item.fn));
             assignable.forEach((c, item) -> ASSIGNABLE_FROM.put(c, item.fn));
         }