Author: bdaw Date: 2009-03-19 09:23:38 -0400 (Thu, 19 Mar 2009) New Revision: 383 Modified: idm/trunk/idm-api/src/main/java/org/jboss/identity/idm/api/Group.java idm/trunk/idm-api/src/main/java/org/jboss/identity/idm/api/IdentityType.java idm/trunk/idm-api/src/main/java/org/jboss/identity/idm/api/User.java idm/trunk/idm/src/main/java/org/jboss/identity/idm/impl/api/model/SimpleUser.java idm/trunk/idm/src/main/java/org/jboss/identity/idm/impl/api/session/managers/AbstractManager.java idm/trunk/idm/src/test/java/org/jboss/identity/idm/impl/api/PersistenceManagerTest.java idm/trunk/idm/src/test/java/org/jboss/identity/idm/impl/api/RelationshipManagerTest.java idm/trunk/idm/src/test/java/org/jboss/identity/idm/impl/api/RoleManagerTest.java Log: - Use id instead of name in User Modified: idm/trunk/idm/src/main/java/org/jboss/identity/idm/impl/api/model/SimpleUser.java =================================================================== --- idm/trunk/idm/src/main/java/org/jboss/identity/idm/impl/api/model/SimpleUser.java 2009-03-19 12:54:42 UTC (rev 382) +++ idm/trunk/idm/src/main/java/org/jboss/identity/idm/impl/api/model/SimpleUser.java 2009-03-19 13:23:38 UTC (rev 383) @@ -30,17 +30,17 @@ */ public class SimpleUser implements User { - private final String name; + private final String id; - public SimpleUser(String name) + public SimpleUser(String id) { - this.name = name; + this.id = id; } - public String getName() + public String getId() { - return name; + return id; } @Override @@ -57,7 +57,7 @@ SimpleUser that = (SimpleUser)o; - if (name != null ? !name.equals(that.name) : that.name != null) + if (id != null ? !id.equals(that.id) : that.id != null) { return false; } @@ -68,6 +68,6 @@ @Override public int hashCode() { - return name != null ? name.hashCode() : 0; + return id != null ? id.hashCode() : 0; } } Modified: idm/trunk/idm/src/main/java/org/jboss/identity/idm/impl/api/session/managers/AbstractManager.java =================================================================== --- idm/trunk/idm/src/main/java/org/jboss/identity/idm/impl/api/session/managers/AbstractManager.java 2009-03-19 12:54:42 UTC (rev 382) +++ idm/trunk/idm/src/main/java/org/jboss/identity/idm/impl/api/session/managers/AbstractManager.java 2009-03-19 13:23:38 UTC (rev 383) @@ -116,7 +116,7 @@ { IdentityObjectType iot = getSessionContext().getIdentityObjectTypeMapper().getIdentityObjectType(); - return new SimpleIdentityObject(identity.getName(), iot); + return new SimpleIdentityObject(identity.getId(), iot); } protected IdentityObject createIdentityObjectForUserName(String userName) Modified: idm/trunk/idm/src/test/java/org/jboss/identity/idm/impl/api/PersistenceManagerTest.java =================================================================== --- idm/trunk/idm/src/test/java/org/jboss/identity/idm/impl/api/PersistenceManagerTest.java 2009-03-19 12:54:42 UTC (rev 382) +++ idm/trunk/idm/src/test/java/org/jboss/identity/idm/impl/api/PersistenceManagerTest.java 2009-03-19 13:23:38 UTC (rev 383) @@ -25,19 +25,9 @@ import org.jboss.identity.idm.api.IdentitySession; import org.jboss.identity.idm.api.Group; import org.jboss.identity.idm.api.User; -import org.jboss.identity.idm.api.RoleType; import org.jboss.identity.idm.api.IdentitySessionFactory; -import org.jboss.identity.idm.api.Attribute; -import org.jboss.identity.idm.api.AttributeDescription; import org.jboss.identity.idm.api.IdentitySearchControl; -import org.jboss.identity.idm.p3p.P3PConstants; -import org.jboss.identity.idm.exception.IdentityException; -import java.util.Collection; -import java.util.Map; -import java.util.Random; -import java.util.Arrays; - import junit.framework.Assert; /** @@ -155,7 +145,7 @@ User u1 = session.getPersistenceManager().createUser("olo"); assertNotNull(u1); - assertEquals(u1.getName(), "olo"); + assertEquals(u1.getId(), "olo"); session.getPersistenceManager().createUser("anna"); Modified: idm/trunk/idm/src/test/java/org/jboss/identity/idm/impl/api/RelationshipManagerTest.java =================================================================== --- idm/trunk/idm/src/test/java/org/jboss/identity/idm/impl/api/RelationshipManagerTest.java 2009-03-19 12:54:42 UTC (rev 382) +++ idm/trunk/idm/src/test/java/org/jboss/identity/idm/impl/api/RelationshipManagerTest.java 2009-03-19 13:23:38 UTC (rev 383) @@ -25,18 +25,10 @@ import org.jboss.identity.idm.api.IdentitySession; import org.jboss.identity.idm.api.Group; import org.jboss.identity.idm.api.User; -import org.jboss.identity.idm.api.RoleType; import org.jboss.identity.idm.api.IdentitySessionFactory; -import org.jboss.identity.idm.api.Attribute; -import org.jboss.identity.idm.api.AttributeDescription; import org.jboss.identity.idm.api.IdentitySearchControl; -import org.jboss.identity.idm.p3p.P3PConstants; -import java.util.Collection; -import java.util.Map; -import java.util.Random; import java.util.Arrays; -import java.util.LinkedList; import junit.framework.Assert; @@ -177,18 +169,18 @@ assertFalse(session.getRelationshipManager().isAssociated(Arrays.asList(group1, group2), Arrays.asList(user1, user2))); assertFalse(session.getRelationshipManager().isAssociated(Arrays.asList(group2), Arrays.asList(user3))); - assertTrue(session.getRelationshipManager().isAssociatedByIds(group1.getId(), user1.getName())); - assertTrue(session.getRelationshipManager().isAssociatedByIds(group1.getId(), user2.getName())); - assertFalse(session.getRelationshipManager().isAssociatedByIds(group1.getId(), user3.getName())); - assertFalse(session.getRelationshipManager().isAssociatedByIds(group2.getId(), user1.getName())); - assertFalse(session.getRelationshipManager().isAssociatedByIds(group2.getId(), user3.getName())); + assertTrue(session.getRelationshipManager().isAssociatedByIds(group1.getId(), user1.getId())); + assertTrue(session.getRelationshipManager().isAssociatedByIds(group1.getId(), user2.getId())); + assertFalse(session.getRelationshipManager().isAssociatedByIds(group1.getId(), user3.getId())); + assertFalse(session.getRelationshipManager().isAssociatedByIds(group2.getId(), user1.getId())); + assertFalse(session.getRelationshipManager().isAssociatedByIds(group2.getId(), user3.getId())); assertTrue(session.getRelationshipManager(). - isAssociatedByIds(Arrays.asList(group1.getId()), Arrays.asList(user1.getName(), user2.getName()))); + isAssociatedByIds(Arrays.asList(group1.getId()), Arrays.asList(user1.getId(), user2.getId()))); assertFalse(session.getRelationshipManager(). - isAssociatedByIds(Arrays.asList(group1.getId(), group2.getId()), Arrays.asList(user1.getName(), user2.getName()))); + isAssociatedByIds(Arrays.asList(group1.getId(), group2.getId()), Arrays.asList(user1.getId(), user2.getId()))); assertFalse(session.getRelationshipManager(). - isAssociatedByIds(Arrays.asList(group2.getId(), group3.getId()), Arrays.asList(user1.getName()))); + isAssociatedByIds(Arrays.asList(group2.getId(), group3.getId()), Arrays.asList(user1.getId()))); // Associate groups / users - other methods @@ -206,14 +198,14 @@ session.getRelationshipManager().disassociateUsers(Arrays.asList(group1), Arrays.asList(user1, user2)); // reassociate #2 - session.getRelationshipManager().associateUsersByIds(Arrays.asList(group1.getId()), Arrays.asList(user1.getName(), user2.getName())); + session.getRelationshipManager().associateUsersByIds(Arrays.asList(group1.getId()), Arrays.asList(user1.getId(), user2.getId())); assertTrue(session.getRelationshipManager().isAssociated(Arrays.asList(group1), Arrays.asList(user1, user2))); - session.getRelationshipManager().disassociateUsersByIds(Arrays.asList(group1.getId()), Arrays.asList(user1.getName(), user2.getName())); + session.getRelationshipManager().disassociateUsersByIds(Arrays.asList(group1.getId()), Arrays.asList(user1.getId(), user2.getId())); // reassociate #3 - session.getRelationshipManager().associateUsersByIds(group1.getId(), user1.getName()); - session.getRelationshipManager().associateUsersByIds(group1.getId(), user2.getName()); + session.getRelationshipManager().associateUsersByIds(group1.getId(), user1.getId()); + session.getRelationshipManager().associateUsersByIds(group1.getId(), user2.getId()); assertTrue(session.getRelationshipManager().isAssociated(Arrays.asList(group1), Arrays.asList(user1, user2))); @@ -281,10 +273,10 @@ assertEquals(0, session.getRelationshipManager().findAssociatedGroups(user4).size()); // #6 - assertEquals(1, session.getRelationshipManager().findAssociatedGroups(user1.getName(), null).size()); - assertEquals(2, session.getRelationshipManager().findAssociatedGroups(user2.getName(), null).size()); - assertEquals(2, session.getRelationshipManager().findAssociatedGroups(user3.getName(), null).size()); - assertEquals(0, session.getRelationshipManager().findAssociatedGroups(user4.getName(), null).size()); + assertEquals(1, session.getRelationshipManager().findAssociatedGroups(user1.getId(), null).size()); + assertEquals(2, session.getRelationshipManager().findAssociatedGroups(user2.getId(), null).size()); + assertEquals(2, session.getRelationshipManager().findAssociatedGroups(user3.getId(), null).size()); + assertEquals(0, session.getRelationshipManager().findAssociatedGroups(user4.getId(), null).size()); // #7 assertEquals(1, session.getRelationshipManager().findAssociatedGroups(user1, ORGANIZATION).size()); @@ -298,14 +290,14 @@ assertEquals(0, session.getRelationshipManager().findAssociatedGroups(user4, ORGANIZATION_UNIT).size()); // #7 - assertEquals(1, session.getRelationshipManager().findAssociatedGroups(user1.getName(), ORGANIZATION, null).size()); - assertEquals(0, session.getRelationshipManager().findAssociatedGroups(user1.getName(), ORGANIZATION_UNIT, null).size()); - assertEquals(1, session.getRelationshipManager().findAssociatedGroups(user2.getName(), ORGANIZATION, null).size()); - assertEquals(1, session.getRelationshipManager().findAssociatedGroups(user2.getName(), ORGANIZATION_UNIT, null).size()); - assertEquals(1, session.getRelationshipManager().findAssociatedGroups(user3.getName(), ORGANIZATION, null).size()); - assertEquals(1, session.getRelationshipManager().findAssociatedGroups(user3.getName(), ORGANIZATION_UNIT, null).size()); - assertEquals(0, session.getRelationshipManager().findAssociatedGroups(user4.getName(), ORGANIZATION, null).size()); - assertEquals(0, session.getRelationshipManager().findAssociatedGroups(user4.getName(), ORGANIZATION_UNIT, null).size()); + assertEquals(1, session.getRelationshipManager().findAssociatedGroups(user1.getId(), ORGANIZATION, null).size()); + assertEquals(0, session.getRelationshipManager().findAssociatedGroups(user1.getId(), ORGANIZATION_UNIT, null).size()); + assertEquals(1, session.getRelationshipManager().findAssociatedGroups(user2.getId(), ORGANIZATION, null).size()); + assertEquals(1, session.getRelationshipManager().findAssociatedGroups(user2.getId(), ORGANIZATION_UNIT, null).size()); + assertEquals(1, session.getRelationshipManager().findAssociatedGroups(user3.getId(), ORGANIZATION, null).size()); + assertEquals(1, session.getRelationshipManager().findAssociatedGroups(user3.getId(), ORGANIZATION_UNIT, null).size()); + assertEquals(0, session.getRelationshipManager().findAssociatedGroups(user4.getId(), ORGANIZATION, null).size()); + assertEquals(0, session.getRelationshipManager().findAssociatedGroups(user4.getId(), ORGANIZATION_UNIT, null).size()); // Cleanup and check session.getRelationshipManager().disassociateUsers(Arrays.asList(group1), Arrays.asList(user1, user2, user3)); @@ -350,13 +342,13 @@ session.getRoleManager().createRoleType("rt1"); session.getRoleManager().createRoleType("rt2"); - session.getRoleManager().createRole("rt1", user1.getName(), group1.getId()); - session.getRoleManager().createRole("rt1", user3.getName(), group1.getId()); - session.getRoleManager().createRole("rt1", user4.getName(), group1.getId()); - session.getRoleManager().createRole("rt2", user3.getName(), group1.getId()); + session.getRoleManager().createRole("rt1", user1.getId(), group1.getId()); + session.getRoleManager().createRole("rt1", user3.getId(), group1.getId()); + session.getRoleManager().createRole("rt1", user4.getId(), group1.getId()); + session.getRoleManager().createRole("rt2", user3.getId(), group1.getId()); - session.getRoleManager().createRole("rt1", user3.getName(), group2.getId()); - session.getRoleManager().createRole("rt2", user2.getName(), group3.getId()); + session.getRoleManager().createRole("rt1", user3.getId(), group2.getId()); + session.getRoleManager().createRole("rt2", user2.getId(), group3.getId()); // Assert Modified: idm/trunk/idm/src/test/java/org/jboss/identity/idm/impl/api/RoleManagerTest.java =================================================================== --- idm/trunk/idm/src/test/java/org/jboss/identity/idm/impl/api/RoleManagerTest.java 2009-03-19 12:54:42 UTC (rev 382) +++ idm/trunk/idm/src/test/java/org/jboss/identity/idm/impl/api/RoleManagerTest.java 2009-03-19 13:23:38 UTC (rev 383) @@ -27,19 +27,8 @@ import org.jboss.identity.idm.api.User; import org.jboss.identity.idm.api.RoleType; import org.jboss.identity.idm.api.IdentitySessionFactory; -import org.jboss.identity.idm.api.Attribute; -import org.jboss.identity.idm.api.AttributeDescription; -import org.jboss.identity.idm.api.IdentitySearchControl; -import org.jboss.identity.idm.api.RoleManager; import org.jboss.identity.idm.api.Role; -import org.jboss.identity.idm.p3p.P3PConstants; -import java.util.Collection; -import java.util.Map; -import java.util.Random; -import java.util.Arrays; -import java.util.LinkedList; - import junit.framework.Assert; /** @@ -133,7 +122,7 @@ Role role1 = session.getRoleManager().createRole(rt1, user1, group1); Role role2 = session.getRoleManager().createRole(rt1, user1, group2); - Role role3 = session.getRoleManager().createRole("rt2", user1.getName(), group1.getId()); + Role role3 = session.getRoleManager().createRole("rt2", user1.getId(), group1.getId()); // @@ -150,24 +139,24 @@ // assertEquals(2, session.getRoleManager().findRoles(user1, rt1).size()); - assertEquals(1, session.getRoleManager().findRoles(user1.getName(), "rt2").size()); + assertEquals(1, session.getRoleManager().findRoles(user1.getId(), "rt2").size()); assertEquals(1, session.getRoleManager().findRoles(group1.getId(), "rt1").size()); assertEquals(1, session.getRoleManager().findRoles(group1, rt1).size()); // assertEquals(2, session.getRoleManager().findGroupsWithRelatedRole(user1, null).size()); - assertEquals(1, session.getRoleManager().findGroupsWithRelatedRole(user1.getName(), ORGANIZATION, null).size()); + assertEquals(1, session.getRoleManager().findGroupsWithRelatedRole(user1.getId(), ORGANIZATION, null).size()); // assertEquals(2, session.getRoleManager().findRoleTypes(user1, group1).size()); - assertEquals(1, session.getRoleManager().findRoleTypes(user1.getName(), group2.getId(), null).size()); + assertEquals(1, session.getRoleManager().findRoleTypes(user1.getId(), group2.getId(), null).size()); // assertEquals(2, session.getRoleManager().findUserRoleTypes(user1).size()); - assertEquals(0, session.getRoleManager().findUserRoleTypes(user2.getName(), null).size()); + assertEquals(0, session.getRoleManager().findUserRoleTypes(user2.getId(), null).size()); // assertTrue(session.getRoleManager().hasRole(user1, group1, rt1)); @@ -182,7 +171,7 @@ session.getRoleManager().removeRole(rt1, user1, group1); session.getRoleManager().removeRole(role2); - session.getRoleManager().removeRole("rt2", user1.getName(), group1.getId()); + session.getRoleManager().removeRole("rt2", user1.getId(), group1.getId()); assertFalse(session.getRoleManager().hasRole(user1, group1, rt1)); assertFalse(session.getRoleManager().hasRole(user1, group1, rt2)); @@ -203,24 +192,24 @@ // assertEquals(0, session.getRoleManager().findRoles(user1, rt1).size()); - assertEquals(0, session.getRoleManager().findRoles(user1.getName(), "rt2").size()); + assertEquals(0, session.getRoleManager().findRoles(user1.getId(), "rt2").size()); assertEquals(0, session.getRoleManager().findRoles(group1.getId(), "rt1").size()); assertEquals(0, session.getRoleManager().findRoles(group1, rt1).size()); // assertEquals(0, session.getRoleManager().findGroupsWithRelatedRole(user1, null).size()); - assertEquals(0, session.getRoleManager().findGroupsWithRelatedRole(user1.getName(), ORGANIZATION, null).size()); + assertEquals(0, session.getRoleManager().findGroupsWithRelatedRole(user1.getId(), ORGANIZATION, null).size()); // assertEquals(0, session.getRoleManager().findRoleTypes(user1, group1).size()); - assertEquals(0, session.getRoleManager().findRoleTypes(user1.getName(), group2.getId(), null).size()); + assertEquals(0, session.getRoleManager().findRoleTypes(user1.getId(), group2.getId(), null).size()); // assertEquals(0, session.getRoleManager().findUserRoleTypes(user1).size()); - assertEquals(0, session.getRoleManager().findUserRoleTypes(user2.getName(), null).size()); + assertEquals(0, session.getRoleManager().findUserRoleTypes(user2.getId(), null).size()); Modified: idm/trunk/idm-api/src/main/java/org/jboss/identity/idm/api/Group.java =================================================================== --- idm/trunk/idm-api/src/main/java/org/jboss/identity/idm/api/Group.java 2009-03-19 12:54:42 UTC (rev 382) +++ idm/trunk/idm-api/src/main/java/org/jboss/identity/idm/api/Group.java 2009-03-19 13:23:38 UTC (rev 383) @@ -25,7 +25,10 @@ package org.jboss.identity.idm.api; /** - * Represents a Group + * Represents a Group. Group has a name that is unique in scope of a given group type. This means that groupType/name pairs + * uniquely identifies group. Group Id contains encoded group type and name imformation. In default implementation + * it can look as follows: "group://GROUP_TYPE/GROUP_NAME". Still prefix and format of Id can change in the future so + * PersistenceManager.createGroupId(String groupName, String groupType) method should be used to create it. * * @author Anil.Saldhana(a)redhat.com * @author <a href="mailto:boleslaw.dawidowicz at redhat.com">Boleslaw Dawidowicz</a> @@ -35,9 +38,9 @@ { /** - * @return id of this Group. Should be in format "groupType/groupName" + * @return the name of the Group */ - String getId(); + String getName(); /** * @return group type name Modified: idm/trunk/idm-api/src/main/java/org/jboss/identity/idm/api/IdentityType.java =================================================================== --- idm/trunk/idm-api/src/main/java/org/jboss/identity/idm/api/IdentityType.java 2009-03-19 12:54:42 UTC (rev 382) +++ idm/trunk/idm-api/src/main/java/org/jboss/identity/idm/api/IdentityType.java 2009-03-19 13:23:38 UTC (rev 383) @@ -35,8 +35,8 @@ { /** - * @return the name of the IdentityType + * @return the id of the IdentityType */ - String getName(); + String getId(); } \ No newline at end of file Modified: idm/trunk/idm-api/src/main/java/org/jboss/identity/idm/api/User.java =================================================================== --- idm/trunk/idm-api/src/main/java/org/jboss/identity/idm/api/User.java 2009-03-19 12:54:42 UTC (rev 382) +++ idm/trunk/idm-api/src/main/java/org/jboss/identity/idm/api/User.java 2009-03-19 13:23:38 UTC (rev 383) @@ -22,7 +22,7 @@ package org.jboss.identity.idm.api; /** - * Represents an Identity + * Represents an User. User has unique id. * * @author Anil.Saldhana(a)redhat.com * @author <a href="mailto:boleslaw.dawidowicz at redhat.com">Boleslaw Dawidowicz</a> @@ -30,5 +30,6 @@ */ public interface User extends IdentityType { + } \ No newline at end of file