Author: bdaw Date: 2009-06-22 06:25:56 -0400 (Mon, 22 Jun 2009) New Revision: 622 Modified: idm/trunk/idm-core/src/main/java/org/jboss/identity/idm/impl/api/session/managers/PersistenceManagerImpl.java idm/trunk/idm-testsuite/src/test/java/org/jboss/identity/idm/impl/api/PersistenceManagerTest.java Log: fix findGroupById method impl Modified: idm/trunk/idm-core/src/main/java/org/jboss/identity/idm/impl/api/session/managers/PersistenceManagerImpl.java =================================================================== --- idm/trunk/idm-core/src/main/java/org/jboss/identity/idm/impl/api/session/managers/PersistenceManagerImpl.java 2009-06-22 08:42:23 UTC (rev 621) +++ idm/trunk/idm-core/src/main/java/org/jboss/identity/idm/impl/api/session/managers/PersistenceManagerImpl.java 2009-06-22 10:25:56 UTC (rev 622) @@ -245,13 +245,16 @@ { checkNotNullArgument(id, "Group id"); - IdentityObject io = getRepository().findIdentityObject(getInvocationContext(), id); - - if (io != null) + if (!GroupId.validateId(id)) { - return createGroup(io); + throw new IdentityException("Provided group id is not valid: " + id + "; " + + "Please use PersistenceManager.createGroupId() to obtain valid group id"); } - return null; + + GroupId groupId = new GroupId(id); + + return findGroup(groupId.getName(), groupId.getType()); + } public Collection<Group> findGroup(String groupType, IdentitySearchCriteria criteria) throws IdentityException Modified: idm/trunk/idm-testsuite/src/test/java/org/jboss/identity/idm/impl/api/PersistenceManagerTest.java =================================================================== --- idm/trunk/idm-testsuite/src/test/java/org/jboss/identity/idm/impl/api/PersistenceManagerTest.java 2009-06-22 08:42:23 UTC (rev 621) +++ idm/trunk/idm-testsuite/src/test/java/org/jboss/identity/idm/impl/api/PersistenceManagerTest.java 2009-06-22 10:25:56 UTC (rev 622) @@ -109,11 +109,16 @@ assertEquals(group1.getGroupType(), ORGANIZATION); assertEquals(group1.getName(), "groupName1"); - String group1Id = session.getPersistenceManager().createGroupId("groupName1", ORGANIZATION); assertEquals(group1Id, group1.getId()); + group1 = session.getPersistenceManager().findGroupById(group1Id); + + assertNotNull(group1); + assertEquals(group1.getGroupType(), ORGANIZATION); + assertEquals(group1.getName(), "groupName1"); + session.getPersistenceManager().createGroup("groupName2", ORGANIZATION); session.getPersistenceManager().createGroup("groupName3", PROJECT);