Feature/remove hard requirements for mdc (eclipse-hawkbit#1811)

* Remove hard requirements for MDCHandler dependencies Signed-off-by: Marinov Avgustin <[email protected]> --------- Signed-off-by: Marinov Avgustin <[email protected]>
bosch-io · Aug 9, 2024 · e874cf5 · e874cf5
1 parent 8c2d103
commit e874cf5
Showing 1 changed file with 4 additions and 4 deletions.
diff --git a/hawkbit-security-core/src/main/java/org/eclipse/hawkbit/security/MDCHandler.java b/hawkbit-security-core/src/main/java/org/eclipse/hawkbit/security/MDCHandler.java
@@ -38,9 +38,9 @@ public class MDCHandler {
 
     @Value("${hawkbit.logging.mdchandler.enabled:true}")
     private boolean mdcEnabled;
-    @Autowired
-    private SpringSecurityAuditorAware springSecurityAuditorAware;
-    @Autowired
+    @Autowired(required = false)
+    private SpringSecurityAuditorAware springSecurityAuditorAware = new SpringSecurityAuditorAware();
+    @Autowired(required = false)
     private SystemSecurityContext securityContext;
 
     /**
@@ -110,7 +110,7 @@ private <T> T putUserAndCall(final Callable<T> callable) throws WrappedException
         final String user = springSecurityAuditorAware
                 .getCurrentAuditor()
                 .filter(username -> !username.equals("system")) // null and system are the same - system user
-                .map(username -> (securityContext.isCurrentThreadSystemCode() ? "as " : "") + username)
+                .map(username -> (securityContext != null && securityContext.isCurrentThreadSystemCode() ? "as " : "") + username)
                 .orElse(null);
 
         final String currentUser = MDC.get(MDC_KEY_USER);