diff --git a/impl/core/src/main/java/br/gov/frameworkdemoiselle/security/RequiredPermissionInterceptor.java b/impl/core/src/main/java/br/gov/frameworkdemoiselle/security/RequiredPermissionInterceptor.java index 4c71f44..a2a788a 100644 --- a/impl/core/src/main/java/br/gov/frameworkdemoiselle/security/RequiredPermissionInterceptor.java +++ b/impl/core/src/main/java/br/gov/frameworkdemoiselle/security/RequiredPermissionInterceptor.java @@ -85,7 +85,7 @@ public class RequiredPermissionInterceptor implements Serializable { String username = null; if (getSecurityContext().isLoggedIn()) { - username = getUsername(); + username = getSecurityContext().getUser().getId(); getLogger().trace(getBundle().getString("access-checking", username, operation, resource)); } @@ -99,22 +99,6 @@ public class RequiredPermissionInterceptor implements Serializable { } /** - * Returns the id of the currently logged in user. - * - * @return the id of the currently logged in user - */ - private String getUsername() { - String username = ""; - User user = getSecurityContext().getUser(); - - if (user != null && user.getId() != null) { - username = user.getId(); - } - - return username; - } - - /** * Returns the resource defined in {@code @RequiredPermission} annotation, the name defined in {@code @Name} * annotation or the class name itself * @@ -131,7 +115,7 @@ public class RequiredPermissionInterceptor implements Serializable { requiredPermission = ic.getTarget().getClass().getAnnotation(RequiredPermission.class); } - if (requiredPermission == null || Strings.isEmpty(requiredPermission.resource())) { + if (Strings.isEmpty(requiredPermission.resource())) { if (ic.getTarget().getClass().getAnnotation(Name.class) == null) { return ic.getTarget().getClass().getSimpleName(); } else { @@ -159,7 +143,7 @@ public class RequiredPermissionInterceptor implements Serializable { requiredPermission = ic.getTarget().getClass().getAnnotation(RequiredPermission.class); } - if (requiredPermission == null || Strings.isEmpty(requiredPermission.operation())) { + if (Strings.isEmpty(requiredPermission.operation())) { if (ic.getMethod().getAnnotation(Name.class) == null) { return ic.getMethod().getName(); } else { -- libgit2 0.21.2