From e874cf501455abe37ea9abad05f42d63f52c6fab Mon Sep 17 00:00:00 2001 From: Avgustin Marinov Date: Fri, 9 Aug 2024 18:12:58 +0300 Subject: [PATCH] Feature/remove hard requirements for mdc (#1811) * Remove hard requirements for MDCHandler dependencies Signed-off-by: Marinov Avgustin --------- Signed-off-by: Marinov Avgustin --- .../java/org/eclipse/hawkbit/security/MDCHandler.java | 8 ++++---- 1 file changed, 4 insertions(+), 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 index fd9de1c371..3b9e0d8268 100644 --- 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 putUserAndCall(final Callable 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);