From ea19f82b8a526d920ff1e1c2830d5e99d8124472 Mon Sep 17 00:00:00 2001
From: Seongguk Jeong <seongguk.dev@gmail.com>
Date: Sun, 9 Jul 2023 23:53:53 +0900
Subject: [PATCH] Using pattern matching for instanceof

---
 .../AbstractAuthenticationToken.java              | 15 +++++++--------
 .../AnonymousAuthenticationToken.java             |  3 +--
 .../web/jaasapi/JaasApiIntegrationFilter.java     |  3 +--
 3 files changed, 9 insertions(+), 12 deletions(-)

diff --git a/core/src/main/java/org/springframework/security/authentication/AbstractAuthenticationToken.java b/core/src/main/java/org/springframework/security/authentication/AbstractAuthenticationToken.java
index 78cec88812..cfd066a912 100644
--- a/core/src/main/java/org/springframework/security/authentication/AbstractAuthenticationToken.java
+++ b/core/src/main/java/org/springframework/security/authentication/AbstractAuthenticationToken.java
@@ -68,14 +68,14 @@ public abstract class AbstractAuthenticationToken implements Authentication, Cre
 
 	@Override
 	public String getName() {
-		if (this.getPrincipal() instanceof UserDetails) {
-			return ((UserDetails) this.getPrincipal()).getUsername();
+		if (this.getPrincipal() instanceof UserDetails userDetails) {
+			return userDetails.getUsername();
 		}
-		if (this.getPrincipal() instanceof AuthenticatedPrincipal) {
-			return ((AuthenticatedPrincipal) this.getPrincipal()).getName();
+		if (this.getPrincipal() instanceof AuthenticatedPrincipal authenticatedPrincipal) {
+			return authenticatedPrincipal.getName();
 		}
-		if (this.getPrincipal() instanceof Principal) {
-			return ((Principal) this.getPrincipal()).getName();
+		if (this.getPrincipal() instanceof Principal principal) {
+			return principal.getName();
 		}
 		return (this.getPrincipal() == null) ? "" : this.getPrincipal().toString();
 	}
@@ -119,10 +119,9 @@ public abstract class AbstractAuthenticationToken implements Authentication, Cre
 
 	@Override
 	public boolean equals(Object obj) {
-		if (!(obj instanceof AbstractAuthenticationToken)) {
+		if (!(obj instanceof AbstractAuthenticationToken test)) {
 			return false;
 		}
-		AbstractAuthenticationToken test = (AbstractAuthenticationToken) obj;
 		if (!this.authorities.equals(test.authorities)) {
 			return false;
 		}
diff --git a/core/src/main/java/org/springframework/security/authentication/AnonymousAuthenticationToken.java b/core/src/main/java/org/springframework/security/authentication/AnonymousAuthenticationToken.java
index 2e92d105f7..2e2a47b7e4 100644
--- a/core/src/main/java/org/springframework/security/authentication/AnonymousAuthenticationToken.java
+++ b/core/src/main/java/org/springframework/security/authentication/AnonymousAuthenticationToken.java
@@ -74,8 +74,7 @@ public class AnonymousAuthenticationToken extends AbstractAuthenticationToken im
 		if (!super.equals(obj)) {
 			return false;
 		}
-		if (obj instanceof AnonymousAuthenticationToken) {
-			AnonymousAuthenticationToken test = (AnonymousAuthenticationToken) obj;
+		if (obj instanceof AnonymousAuthenticationToken test) {
 			return (this.getKeyHash() == test.getKeyHash());
 		}
 		return false;
diff --git a/web/src/main/java/org/springframework/security/web/jaasapi/JaasApiIntegrationFilter.java b/web/src/main/java/org/springframework/security/web/jaasapi/JaasApiIntegrationFilter.java
index be8b52ebda..a01ce81e95 100644
--- a/web/src/main/java/org/springframework/security/web/jaasapi/JaasApiIntegrationFilter.java
+++ b/web/src/main/java/org/springframework/security/web/jaasapi/JaasApiIntegrationFilter.java
@@ -127,10 +127,9 @@ public class JaasApiIntegrationFilter extends GenericFilterBean {
 		if (!authentication.isAuthenticated()) {
 			return null;
 		}
-		if (!(authentication instanceof JaasAuthenticationToken)) {
+		if (!(authentication instanceof JaasAuthenticationToken token)) {
 			return null;
 		}
-		JaasAuthenticationToken token = (JaasAuthenticationToken) authentication;
 		LoginContext loginContext = token.getLoginContext();
 		if (loginContext == null) {
 			return null;