Merge branch '6.1.x'

config/src/main/java/org/springframework/security/config/annotation/web/builders/FilterOrderRegistration.java

@@ -1,5 +1,5 @@
 /*
- * Copyright 2002-2021 the original author or authors.
+ * Copyright 2002-2023 the original author or authors.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -127,11 +127,7 @@ final class FilterOrderRegistration {
 	 * @param position the position to associate with the {@link Filter}
 	 */
 	void put(Class<? extends Filter> filter, int position) {
-		String className = filter.getName();
-		if (this.filterToOrder.containsKey(className)) {
-			return;
-		}
-		this.filterToOrder.put(className, position);
+		this.filterToOrder.putIfAbsent(filter.getName(), position);
 	}
 
 	/**

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;
 		}

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;

core/src/main/java/org/springframework/security/authentication/jaas/JaasGrantedAuthority.java

@@ -59,7 +59,7 @@ public final class JaasGrantedAuthority implements GrantedAuthority {
 			return true;
 		}
 		if (obj instanceof JaasGrantedAuthority jga) {
-			return this.role.equals(jga.role) && this.principal.equals(jga.principal);
+			return this.role.equals(jga.getAuthority()) && this.principal.equals(jga.getPrincipal());
 		}
 		return false;
 	}

core/src/main/java/org/springframework/security/core/authority/SimpleGrantedAuthority.java

@@ -1,5 +1,5 @@
 /*
- * Copyright 2002-2016 the original author or authors.
+ * Copyright 2002-2023 the original author or authors.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -50,8 +50,8 @@ public final class SimpleGrantedAuthority implements GrantedAuthority {
 		if (this == obj) {
 			return true;
 		}
-		if (obj instanceof SimpleGrantedAuthority) {
-			return this.role.equals(((SimpleGrantedAuthority) obj).role);
+		if (obj instanceof SimpleGrantedAuthority sga) {
+			return this.role.equals(sga.getAuthority());
 		}
 		return false;
 	}

core/src/main/java/org/springframework/security/core/userdetails/User.java

@@ -179,8 +179,8 @@ public class User implements UserDetails, CredentialsContainer {
 	 */
 	@Override
 	public boolean equals(Object obj) {
-		if (obj instanceof User) {
-			return this.username.equals(((User) obj).username);
+		if (obj instanceof User user) {
+			return this.username.equals(user.getUsername());
 		}
 		return false;
 	}
@@ -208,7 +208,7 @@ public class User implements UserDetails, CredentialsContainer {
 	}
 
 	/**
-	 * Creates a UserBuilder with a specified user name
+	 * Creates a UserBuilder with a specified username
 	 * @param username the username to use
 	 * @return the UserBuilder
 	 */

ldap/src/main/java/org/springframework/security/ldap/userdetails/LdapAuthority.java

@@ -1,5 +1,5 @@
 /*
- * Copyright 2002-2014 the original author or authors.
+ * Copyright 2002-2023 the original author or authors.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -113,14 +113,13 @@ public class LdapAuthority implements GrantedAuthority {
 		if (this == obj) {
 			return true;
 		}
-		if (!(obj instanceof LdapAuthority)) {
+		if (!(obj instanceof LdapAuthority other)) {
 			return false;
 		}
-		LdapAuthority other = (LdapAuthority) obj;
-		if (!this.dn.equals(other.dn)) {
+		if (!this.dn.equals(other.getDn())) {
 			return false;
 		}
-		return this.role.equals(other.role);
+		return this.role.equals(other.getAuthority());
 	}
 
 	@Override

web/src/main/java/org/springframework/security/web/authentication/switchuser/SwitchUserGrantedAuthority.java

@@ -64,9 +64,8 @@ public final class SwitchUserGrantedAuthority implements GrantedAuthority {
 		if (this == obj) {
 			return true;
 		}
-		if (obj instanceof SwitchUserGrantedAuthority) {
-			SwitchUserGrantedAuthority swa = (SwitchUserGrantedAuthority) obj;
-			return this.role.equals(swa.role) && this.source.equals(swa.source);
+		if (obj instanceof SwitchUserGrantedAuthority swa) {
+			return this.role.equals(swa.getAuthority()) && this.source.equals(swa.getSource());
 		}
 		return false;
 	}

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;