Cwikius-Spring/spring-security
1
0
Fork 0
mirror of https://github.com/spring-projects/spring-security.git synced 2025-06-15 00:22:15 +00:00
Code Issues Packages Projects Releases Wiki Activity

SEC-1304: Removed compareTo method from GrantedAuthorityImpl

Browse Source 
This method had been left by mistake when the Comparable 
interface was removed. See also SEC-1347.
This commit is contained in:
Luke Taylor 2010-01-04 19:13:49 +00:00
parent c6b8fe5e55
commit 93973a4b75
2 changed files with 0 additions and 32 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

14
core/src/main/java/org/springframework/security/core/authority/GrantedAuthorityImpl.java
View File

@ -32,7 +32,6 @@ import org.springframework.util.Assert;
* method will return -1, so the custom authority will take precedence. * method will return -1, so the custom authority will take precedence.
* *
* @author Ben Alex * @author Ben Alex
* @version $Id$
*/ */
public class GrantedAuthorityImpl implements GrantedAuthority, Serializable { public class GrantedAuthorityImpl implements GrantedAuthority, Serializable {
//~ Instance fields ================================================================================================ //~ Instance fields ================================================================================================
@ -74,17 +73,4 @@ public class GrantedAuthorityImpl implements GrantedAuthority, Serializable {
public String toString() { public String toString() {
return this.role; return this.role;
} }
public int compareTo(GrantedAuthority ga) {
if (ga != null) {
String rhsRole = ga.getAuthority();
if (rhsRole == null) {
return -1;
}
return role.compareTo(rhsRole);
}
return -1;
}
} }

18
core/src/test/java/org/springframework/security/core/authority/GrantedAuthorityImplTests.java
View File

@ -61,30 +61,12 @@ public class GrantedAuthorityImplTests {
assertEquals("TEST", auth.toString()); assertEquals("TEST", auth.toString());
} }
@Test
public void compareToGrantedAuthorityWithSameValueReturns0() {
assertEquals(0, new GrantedAuthorityImpl("TEST").compareTo(new MockGrantedAuthority("TEST")));
}
@Test
public void compareToNullReturnsNegativeOne() {
assertEquals(-1, new GrantedAuthorityImpl("TEST").compareTo(null));
}
/* SEC-899 */
@Test
public void compareToHandlesCustomAuthorityWhichReturnsNullFromGetAuthority() {
assertEquals(-1, new GrantedAuthorityImpl("TEST").compareTo(new MockGrantedAuthority()));
}
//~ Inner Classes ================================================================================================== //~ Inner Classes ==================================================================================================
private class MockGrantedAuthority implements GrantedAuthority { private class MockGrantedAuthority implements GrantedAuthority {
private String role; private String role;
public MockGrantedAuthority() {
}
public MockGrantedAuthority(String role) { public MockGrantedAuthority(String role) {
this.role = role; this.role = role;
} }