Commit a73286e3 authored by Brian Major's avatar Brian Major
Browse files

nep110 - Added UserNotFoundException to GMSClient user membership actions

parent 34bc9381

projects/cadcAccessControl/src/ca/nrc/cadc/ac/client/GMSClient.java

+12 −4
Original line number Diff line number Diff line
@@ -494,11 +494,12 @@ public class GMSClient 
     * @param targetGroupName The group in which to add the group member.

     * @param userID The user to add.

     * @throws GroupNotFoundException If the group was not found.

     * @throws GroupNotFoundException If the member was not found.

     * @throws java.io.IOException

     * @throws AccessControlException If unauthorized to perform this operation.

     */

    public void addUserMember(String targetGroupName, Principal userID)

        throws GroupNotFoundException, AccessControlException, IOException

        throws GroupNotFoundException, UserNotFoundException, AccessControlException, IOException

    {

        String userIDType = AuthenticationUtil.getPrincipalType(userID);

        String encodedUserID = URLEncoder.encode(userID.toString(), "UTF-8");
@@ -548,6 +549,9 @@ public class GMSClient 
            }

            if (responseCode == 404)

            {

                if (errMessage != null && errMessage.toLowerCase().contains("user"))

                    throw new UserNotFoundException(errMessage);

                else

                    throw new GroupNotFoundException(errMessage);

            }

            throw new IOException(errMessage);
@@ -625,11 +629,12 @@ public class GMSClient 
     * @param targetGroupName The group from which to remove the group member.

     * @param userID The user to remove.

     * @throws GroupNotFoundException If the group was not found.

     * @throws UserNotFoundException If the member was not found.

     * @throws java.io.IOException

     * @throws AccessControlException If unauthorized to perform this operation.

     */

    public void removeUserMember(String targetGroupName, Principal userID)

        throws GroupNotFoundException, AccessControlException, IOException

        throws GroupNotFoundException, UserNotFoundException, AccessControlException, IOException

    {

        String userIDType = AuthenticationUtil.getPrincipalType(userID);

        String encodedUserID = URLEncoder.encode(userID.toString(), "UTF-8");
@@ -681,6 +686,9 @@ public class GMSClient 
            }

            if (responseCode == 404)

            {

                if (errMessage != null && errMessage.toLowerCase().contains("user"))

                    throw new UserNotFoundException(errMessage);

                else

                    throw new GroupNotFoundException(errMessage);

            }

            throw new IOException(errMessage);