Cwikius-Spring
/
spring-security
mirror of https://github.com/spring-projects/spring-security.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Refactor equals method 

Using the accessor method for fields instead of directly access
This commit is contained in:
Seongguk Jeong 2023-07-18 22:11:33 +09:00 committed by Josh Cummings
parent 8df8d4022e
commit bcd4dcc15c
4 changed files with 11 additions and 14 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

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

6
core/src/main/java/org/springframework/security/core/authority/SimpleGrantedAuthority.java
View File

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

9
ldap/src/main/java/org/springframework/security/ldap/userdetails/LdapAuthority.java
View File

@ -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

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

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