Author: bdaw Date: 2009-06-10 05:08:26 -0400 (Wed, 10 Jun 2009) New Revision: 601 Modified: idm/trunk/idm-api/src/main/java/org/jboss/identity/idm/api/RelationshipManager.java idm/trunk/idm-core/src/main/java/org/jboss/identity/idm/impl/api/session/managers/RelationshipManagerImpl.java idm/trunk/idm-testsuite/src/test/java/org/jboss/identity/idm/impl/api/RelationshipManagerTest.java idm/trunk/idm-testsuite/src/test/resources/organization-test-jboss-unit-config.xml Log: a DisassociateGroups(User user) API in the relationshipManager Modified: idm/trunk/idm-api/src/main/java/org/jboss/identity/idm/api/RelationshipManager.java =================================================================== --- idm/trunk/idm-api/src/main/java/org/jboss/identity/idm/api/RelationshipManager.java 2009-06-10 08:13:17 UTC (rev 600) +++ idm/trunk/idm-api/src/main/java/org/jboss/identity/idm/api/RelationshipManager.java 2009-06-10 09:08:26 UTC (rev 601) @@ -162,6 +162,23 @@ throws IdentityException; /** + * Disassociate all groups from a given user + * + * @param user + * @throws IdentityException + */ + void disassociateGroups(User user) throws IdentityException; + + /** + * Disassociate all groups from a given user + * + * @param userId + * @throws IdentityException + */ + void disassociateGroups(String userId) throws IdentityException; + + + /** * <p>Disassociate groups</p> * @param parents * @param members Modified: idm/trunk/idm-core/src/main/java/org/jboss/identity/idm/impl/api/session/managers/RelationshipManagerImpl.java =================================================================== --- idm/trunk/idm-core/src/main/java/org/jboss/identity/idm/impl/api/session/managers/RelationshipManagerImpl.java 2009-06-10 08:13:17 UTC (rev 600) +++ idm/trunk/idm-core/src/main/java/org/jboss/identity/idm/impl/api/session/managers/RelationshipManagerImpl.java 2009-06-10 09:08:26 UTC (rev 601) @@ -284,6 +284,25 @@ } + public void disassociateGroups(User user) throws IdentityException + { + checkNotNullArgument(user, "User"); + + Collection<Group> groups = findAssociatedGroups(user, (String)null); + Set<User> users = new HashSet<User>(); + users.add(user); + + disassociateUsers(groups, users); + + } + + public void disassociateGroups(String userId) throws IdentityException + { + checkNotNullArgument(userId, "User Id"); + + disassociateGroups(createUserFromId(userId)); + } + public void disassociateGroups(Collection<Group> parents, Collection<Group> members) throws IdentityException { checkNotNullArgument(parents, "parents"); Modified: idm/trunk/idm-testsuite/src/test/java/org/jboss/identity/idm/impl/api/RelationshipManagerTest.java =================================================================== --- idm/trunk/idm-testsuite/src/test/java/org/jboss/identity/idm/impl/api/RelationshipManagerTest.java 2009-06-10 08:13:17 UTC (rev 600) +++ idm/trunk/idm-testsuite/src/test/java/org/jboss/identity/idm/impl/api/RelationshipManagerTest.java 2009-06-10 09:08:26 UTC (rev 601) @@ -212,7 +212,24 @@ session.getRelationshipManager().disassociateUsers(Arrays.asList(group1), Arrays.asList(user1, user2)); + // reassociate #4 + session.getRelationshipManager().associateUserByIds(group1.getId(), user1.getId()); + session.getRelationshipManager().associateUserByIds(group2.getId(), user1.getId()); + session.getRelationshipManager().associateUserByIds(group3.getId(), user1.getId()); + assertTrue(session.getRelationshipManager().isAssociated(Arrays.asList(group1, group2, group3), Arrays.asList(user1))); + + session.getRelationshipManager().disassociateGroups(user1); + + assertFalse(session.getRelationshipManager().isAssociated(group1, user1)); + assertFalse(session.getRelationshipManager().isAssociated(group2, user1)); + assertFalse(session.getRelationshipManager().isAssociated(group3, user1)); + assertFalse(session.getRelationshipManager().isAssociated(Arrays.asList(group1, group2, group3), Arrays.asList(user1))); + + assertEquals(0, session.getRelationshipManager().findAssociatedGroups(user1).size()); + + + ctx.commit(); ctx.begin(); Modified: idm/trunk/idm-testsuite/src/test/resources/organization-test-jboss-unit-config.xml =================================================================== --- idm/trunk/idm-testsuite/src/test/resources/organization-test-jboss-unit-config.xml 2009-06-10 08:13:17 UTC (rev 600) +++ idm/trunk/idm-testsuite/src/test/resources/organization-test-jboss-unit-config.xml 2009-06-10 09:08:26 UTC (rev 601) @@ -86,7 +86,7 @@ <options> <option> <name>cache</name> - <value>true</value> + <value>false</value> </option> <option> <name>cache.provider.class</name> @@ -137,7 +137,7 @@ <options> <option> <name>cache</name> - <value>true</value> + <value>false</value> </option> <option> <name>cache.provider.class</name>