diff --git a/projects/cadcAccessControl-Server/src/ca/nrc/cadc/ac/server/GroupPersistence.java b/projects/cadcAccessControl-Server/src/ca/nrc/cadc/ac/server/GroupPersistence.java index 02fd29bb69e4bcaed93bcf20bfe72604b820662c..fd7ad6269d9edd7616cd7ddd06cde5228bda024f 100755 --- a/projects/cadcAccessControl-Server/src/ca/nrc/cadc/ac/server/GroupPersistence.java +++ b/projects/cadcAccessControl-Server/src/ca/nrc/cadc/ac/server/GroupPersistence.java @@ -79,7 +79,7 @@ import ca.nrc.cadc.ac.Role; import ca.nrc.cadc.ac.UserNotFoundException; import ca.nrc.cadc.net.TransientException; -public abstract interface GroupPersistence<T extends Principal> +public interface GroupPersistence<T extends Principal> { /** * Get all group names. @@ -88,7 +88,7 @@ public abstract interface GroupPersistence<T extends Principal> * @throws TransientException If an temporary, unexpected problem occurred. * @throws AccessControlException If the operation is not permitted. */ - public Collection<String> getGroupNames() + Collection<String> getGroupNames() throws TransientException, AccessControlException; /** @@ -102,7 +102,7 @@ public abstract interface GroupPersistence<T extends Principal> * @throws TransientException If an temporary, unexpected problem occurred. * @throws AccessControlException If the operation is not permitted. */ - public abstract Group getGroup(String groupID) + Group getGroup(String groupID) throws GroupNotFoundException, TransientException, AccessControlException; @@ -121,7 +121,7 @@ public abstract interface GroupPersistence<T extends Principal> * @throws GroupNotFoundException if one of the groups in group members or * group admins does not exist in the server. */ - public abstract Group addGroup(Group group) + Group addGroup(Group group) throws GroupAlreadyExistsException, TransientException, AccessControlException, UserNotFoundException, GroupNotFoundException; @@ -135,7 +135,7 @@ public abstract interface GroupPersistence<T extends Principal> * @throws TransientException If an temporary, unexpected problem occurred. * @throws AccessControlException If the operation is not permitted. */ - public abstract void deleteGroup(String groupID) + void deleteGroup(String groupID) throws GroupNotFoundException, TransientException, AccessControlException; @@ -151,7 +151,7 @@ public abstract interface GroupPersistence<T extends Principal> * @throws AccessControlException If the operation is not permitted. * @throws UserNotFoundException If owner or group members not valid users. */ - public abstract Group modifyGroup(Group group) + Group modifyGroup(Group group) throws GroupNotFoundException, TransientException, AccessControlException, UserNotFoundException; @@ -170,7 +170,7 @@ public abstract interface GroupPersistence<T extends Principal> * @throws TransientException If an temporary, unexpected problem occurred. * @throws AccessControlException If the operation is not permitted. */ - public abstract Collection<Group> getGroups(T userID, Role role, + Collection<Group> getGroups(T userID, Role role, String groupID) throws UserNotFoundException, GroupNotFoundException, TransientException, AccessControlException; @@ -187,7 +187,7 @@ public abstract interface GroupPersistence<T extends Principal> * @throws TransientException If an temporary, unexpected problem occurred. * @throws AccessControlException If the operation is not permitted. */ - public boolean isMember(T userID, String groupID) + boolean isMember(T userID, String groupID) throws UserNotFoundException, TransientException, AccessControlException;