[portal-commits] JBoss Portal SVN: r6341 - in trunk/identity/src/main/org/jboss/portal: test/identity and 1 other directory.
Author: bdaw
Date: 2007-02-19 10:52:27 -0500 (Mon, 19 Feb 2007)
New Revision: 6341
Modified:
trunk/identity/src/main/org/jboss/portal/identity/ldap/LDAPRoleImpl.java
trunk/identity/src/main/org/jboss/portal/identity/ldap/LDAPUserImpl.java
trunk/identity/src/main/org/jboss/portal/test/identity/IdentityTest.java
Log:
- hashCode() implementation for LDAPUserImpl and LDAPRoleImpl
Modified: trunk/identity/src/main/org/jboss/portal/identity/ldap/LDAPRoleImpl.java
===================================================================
--- trunk/identity/src/main/org/jboss/portal/identity/ldap/LDAPRoleImpl.java 2007-02-19
15:44:53 UTC (rev 6340)
+++ trunk/identity/src/main/org/jboss/portal/identity/ldap/LDAPRoleImpl.java 2007-02-19
15:52:27 UTC (rev 6341)
@@ -89,6 +89,28 @@
this.dn = dn;
}
+
+ public boolean equals(Object obj)
+ {
+ if (!(obj instanceof Role))
+ {
+ return super.equals(obj);
+ }
+
+
+ Role r = (Role)obj;
+ if (r.getId().toString().equals(getId().toString()))
+ {
+ return true;
+ }
+ return false;
+ }
+
+ public int hashCode()
+ {
+ return id.hashCode() * 13 + 5;
+ }
+
public String getName()
{
return this.name;
Modified: trunk/identity/src/main/org/jboss/portal/identity/ldap/LDAPUserImpl.java
===================================================================
--- trunk/identity/src/main/org/jboss/portal/identity/ldap/LDAPUserImpl.java 2007-02-19
15:44:53 UTC (rev 6340)
+++ trunk/identity/src/main/org/jboss/portal/identity/ldap/LDAPUserImpl.java 2007-02-19
15:52:27 UTC (rev 6341)
@@ -27,6 +27,7 @@
import org.jboss.portal.identity.IdentityContext;
import org.jboss.portal.identity.User;
import org.jboss.portal.identity.UserProfileModule;
+import org.jboss.portal.identity.Role;
import org.jboss.portal.common.util.Tools;
import java.security.NoSuchAlgorithmException;
@@ -104,6 +105,27 @@
}
+ public boolean equals(Object obj)
+ {
+ if (!(obj instanceof User))
+ {
+ return super.equals(obj);
+ }
+
+
+ User u = (User)obj;
+ if (u.getId().toString().equals(getId().toString()))
+ {
+ return true;
+ }
+ return false;
+ }
+
+ public int hashCode()
+ {
+ return id.hashCode()*13 + 5;
+ }
+
public void updatePassword(String password)
{
if (password == null)
Modified: trunk/identity/src/main/org/jboss/portal/test/identity/IdentityTest.java
===================================================================
--- trunk/identity/src/main/org/jboss/portal/test/identity/IdentityTest.java 2007-02-19
15:44:53 UTC (rev 6340)
+++ trunk/identity/src/main/org/jboss/portal/test/identity/IdentityTest.java 2007-02-19
15:52:27 UTC (rev 6341)
@@ -529,6 +529,10 @@
assertEquals(1, users.size());
+ users = userModule.findUsers(10,10);
+
+ assertEquals(1, users.size());
+
users = userModule.findUsers(10,20);
assertEquals(1, users.size());