From 9631292934984189a72ac7604c6026e3aa968c09 Mon Sep 17 00:00:00 2001 From: Avgustin Marinov Date: Sat, 3 Feb 2024 17:03:08 +0200 Subject: [PATCH] Refactoring/Improving source: security core (#1599) (#1600) Signed-off-by: Marinov Avgustin --- .../eclipse/hawkbit/im/authentication/SpPermission.java | 8 +++----- .../eclipse/hawkbit/security/SystemSecurityContext.java | 2 -- 2 files changed, 3 insertions(+), 7 deletions(-) diff --git a/hawkbit-security-core/src/main/java/org/eclipse/hawkbit/im/authentication/SpPermission.java b/hawkbit-security-core/src/main/java/org/eclipse/hawkbit/im/authentication/SpPermission.java index 0b9b60a34..aa3033616 100644 --- a/hawkbit-security-core/src/main/java/org/eclipse/hawkbit/im/authentication/SpPermission.java +++ b/hawkbit-security-core/src/main/java/org/eclipse/hawkbit/im/authentication/SpPermission.java @@ -14,8 +14,7 @@ import java.lang.reflect.Modifier; import java.util.ArrayList; import java.util.List; -import org.slf4j.Logger; -import org.slf4j.LoggerFactory; +import lombok.extern.slf4j.Slf4j; import org.springframework.security.access.prepost.PreAuthorize; import org.springframework.security.core.GrantedAuthority; @@ -32,10 +31,9 @@ import org.springframework.security.core.GrantedAuthority; * etc. *

*/ +@Slf4j public final class SpPermission { - private static final Logger LOGGER = LoggerFactory.getLogger(SpPermission.class); - /** * Permission to read the targets (list and filter). */ @@ -147,7 +145,7 @@ public final class SpPermission { final String role = (String) field.get(null); allPermissions.add(role); } catch (final IllegalAccessException e) { - LOGGER.error(e.getMessage(), e); + log().error(e.getMessage(), e); } } } diff --git a/hawkbit-security-core/src/main/java/org/eclipse/hawkbit/security/SystemSecurityContext.java b/hawkbit-security-core/src/main/java/org/eclipse/hawkbit/security/SystemSecurityContext.java index 0d065e6a1..ca48dd4f8 100644 --- a/hawkbit-security-core/src/main/java/org/eclipse/hawkbit/security/SystemSecurityContext.java +++ b/hawkbit-security-core/src/main/java/org/eclipse/hawkbit/security/SystemSecurityContext.java @@ -22,8 +22,6 @@ import lombok.extern.slf4j.Slf4j; import org.eclipse.hawkbit.im.authentication.TenantAwareAuthenticationDetails; import org.eclipse.hawkbit.im.authentication.SpPermission.SpringEvalExpressions; import org.eclipse.hawkbit.tenancy.TenantAware; -import org.slf4j.Logger; -import org.slf4j.LoggerFactory; import org.springframework.security.authentication.AnonymousAuthenticationToken; import org.springframework.security.core.Authentication; import org.springframework.security.core.GrantedAuthority;