Use pattern match on instanceof

[aaa.git] / aaa-shiro / impl / src / main / java / org / opendaylight / aaa / shiro / filters / AuthenticationTokenUtils.java

diff --git a/aaa-shiro/impl/src/main/java/org/opendaylight/aaa/shiro/filters/AuthenticationTokenUtils.java b/aaa-shiro/impl/src/main/java/org/opendaylight/aaa/shiro/filters/AuthenticationTokenUtils.java
index fedabde5b30e52a022277be34caee9b33e6a5789..ae0b43a6f75c9851096d4bb7dead71dba5a257cb 100644 (file)
--- a/aaa-shiro/impl/src/main/java/org/opendaylight/aaa/shiro/filters/AuthenticationTokenUtils.java
+++ b/aaa-shiro/impl/src/main/java/org/opendaylight/aaa/shiro/filters/AuthenticationTokenUtils.java
@@ -58,8 +58,7 @@ public final class AuthenticationTokenUtils {
      * @return the username, <code>DEFAULT_USERNAME</code> or <code>DEFAULT_TOKEN</code> depending on input
      */
     public static String extractUsername(final AuthenticationToken token) {
-        if (isUsernamePasswordToken(token)) {
-            final UsernamePasswordToken upt = (UsernamePasswordToken) token;
+        if (token instanceof UsernamePasswordToken upt) {
             return extractField(upt.getUsername(), DEFAULT_USERNAME);
         }
         return DEFAULT_TOKEN;
@@ -76,8 +75,7 @@ public final class AuthenticationTokenUtils {
      * @return the hostname, or <code>DEFAULT_USERNAME</code> depending on input
      */
     public static String extractHostname(final AuthenticationToken token) {
-        if (isUsernamePasswordToken(token)) {
-            final UsernamePasswordToken upt = (UsernamePasswordToken) token;
+        if (token instanceof UsernamePasswordToken upt) {
             return extractField(upt.getHost(), DEFAULT_HOSTNAME);
         }
         return DEFAULT_HOSTNAME;