DATACMNS-1403 - Polishing.

Rewrite auditing example to functional use of java.util.Optional.

Original pull request: #321.
This commit is contained in:
Mark Paluch
2018-10-16 15:12:14 +02:00
parent f404aefec3
commit 8a4e10e0d0

View File

@@ -49,14 +49,11 @@ class SpringSecurityAuditorAware implements AuditorAware<User> {
public Optional<User> getCurrentAuditor() {
Authentication authentication = SecurityContextHolder.getContext().getAuthentication();
if (authentication == null || !authentication.isAuthenticated()) {
return Optional.empty();
}
MyUserDetails myUserDetails = ((MyUserDetails) authentication.getPrincipal()).getUser();
return Optional.of(myUserDetails);
return Optional.ofNullable(SecurityContextHolder.getContext())
.map(SecurityContext::getAuthentication)
.filter(Authentication::isAuthenticated)
.map(Authentication::getPrincipal)
.map(User.class::cast);
}
}
----