This is an automated email from the ASF dual-hosted git repository. ahuber pushed a commit to branch master in repository https://gitbox.apache.org/repos/asf/causeway.git
commit 6356c7a7a52804ef5011a1503137688c0441b035 Author: Andi Huber <[email protected]> AuthorDate: Thu May 11 15:34:35 2023 +0200 CAUSEWAY-3404: ApplicationUser: use nullsafe check for whether unlocked --- .../causeway/extensions/secman/applib/user/dom/ApplicationUser.java | 2 +- .../extensions/secman/applib/user/dom/ApplicationUserStatus.java | 6 ++++-- 2 files changed, 5 insertions(+), 3 deletions(-) diff --git a/extensions/security/secman/applib/src/main/java/org/apache/causeway/extensions/secman/applib/user/dom/ApplicationUser.java b/extensions/security/secman/applib/src/main/java/org/apache/causeway/extensions/secman/applib/user/dom/ApplicationUser.java index 8a4319c003..798efef137 100644 --- a/extensions/security/secman/applib/src/main/java/org/apache/causeway/extensions/secman/applib/user/dom/ApplicationUser.java +++ b/extensions/security/secman/applib/src/main/java/org/apache/causeway/extensions/secman/applib/user/dom/ApplicationUser.java @@ -145,7 +145,7 @@ public abstract class ApplicationUser return getName(); } @ObjectSupport public String iconName() { - return getStatus().isUnlocked() ? "unlocked" : "locked"; + return ApplicationUserStatus.isUnlocked(getStatus()) ? "unlocked" : "locked"; } diff --git a/extensions/security/secman/applib/src/main/java/org/apache/causeway/extensions/secman/applib/user/dom/ApplicationUserStatus.java b/extensions/security/secman/applib/src/main/java/org/apache/causeway/extensions/secman/applib/user/dom/ApplicationUserStatus.java index 684de54b9b..0740035027 100644 --- a/extensions/security/secman/applib/src/main/java/org/apache/causeway/extensions/secman/applib/user/dom/ApplicationUserStatus.java +++ b/extensions/security/secman/applib/src/main/java/org/apache/causeway/extensions/secman/applib/user/dom/ApplicationUserStatus.java @@ -18,6 +18,8 @@ */ package org.apache.causeway.extensions.secman.applib.user.dom; +import org.springframework.lang.Nullable; + import org.apache.causeway.commons.internal.base._Strings; /** @@ -38,8 +40,8 @@ public enum ApplicationUserStatus { return _Strings.capitalize(name()); } - public boolean isUnlocked() { - return this == UNLOCKED; + public static boolean isUnlocked(final @Nullable ApplicationUserStatus applicationUserStatus) { + return applicationUserStatus == UNLOCKED; } }
