Skip to content

Commit

Permalink
Refactor equals method
Browse files Browse the repository at this point in the history
Using the accessor method for fields instead of directly access
  • Loading branch information
limvik authored and jzheaux committed Aug 7, 2023
1 parent 8df8d40 commit bcd4dcc
Show file tree
Hide file tree
Showing 4 changed files with 11 additions and 14 deletions.
Original file line number Diff line number Diff line change
Expand Up @@ -58,9 +58,8 @@ public boolean equals(Object obj) {
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;
}
Expand Down
Original file line number Diff line number Diff line change
@@ -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.
Expand Down Expand Up @@ -50,8 +50,8 @@ public boolean equals(Object obj) {
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;
}
Expand Down
Original file line number Diff line number Diff line change
@@ -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.
Expand Down Expand Up @@ -113,14 +113,13 @@ public boolean equals(Object obj) {
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
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -64,9 +64,8 @@ public boolean equals(Object obj) {
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;
}
Expand Down

0 comments on commit bcd4dcc

Please sign in to comment.