Use pattern match on instanceof

[aaa.git] / aaa-shiro / impl / src / main / java / org / opendaylight / aaa / shiro / realm / MoonRealm.java

diff --git a/aaa-shiro/impl/src/main/java/org/opendaylight/aaa/shiro/realm/MoonRealm.java b/aaa-shiro/impl/src/main/java/org/opendaylight/aaa/shiro/realm/MoonRealm.java
index 4bd67c3180a335b4e109b1996db36a6e01b1ce07..6814feeec4e022db289dfba30e213ffe4d4f829e 100644 (file)
--- a/aaa-shiro/impl/src/main/java/org/opendaylight/aaa/shiro/realm/MoonRealm.java
+++ b/aaa-shiro/impl/src/main/java/org/opendaylight/aaa/shiro/realm/MoonRealm.java
@@ -67,17 +67,17 @@ public class MoonRealm extends AuthorizingRealm {
     protected AuthenticationInfo doGetAuthenticationInfo(final AuthenticationToken authenticationToken)
             throws AuthenticationException {
         final var principal = authenticationToken.getPrincipal();
-        if (!(principal instanceof String)) {
+        if (!(principal instanceof String stringPrincipal)) {
             throw new AuthenticationException("Non-string principal " + principal);
         }
 
-        if (!(authenticationToken instanceof UsernamePasswordToken)) {
+        if (!(authenticationToken instanceof UsernamePasswordToken userPassToken)) {
             throw new AuthenticationException("Token is not UsernamePasswordToken: " + authenticationToken);
         }
 
-        final var password = new String(((UsernamePasswordToken) authenticationToken).getPassword());
+        final var password = new String(userPassToken.getPassword());
         // FIXME: make the domain name configurable
-        final var moonPrincipal = moonAuthenticate((String) principal, password, MOON_DEFAULT_DOMAIN);
+        final var moonPrincipal = moonAuthenticate(stringPrincipal, password, MOON_DEFAULT_DOMAIN);
         return moonPrincipal == null ? null
             : new SimpleAuthenticationInfo(moonPrincipal, password.toCharArray(), getName());
     }