Commit 93bd37b9 authored by Brian Major's avatar Brian Major
Browse files

ac2 - Refactored action classes in cadcAccessControl-Server

parent 7db520cc

projects/cadcAccessControl-Server/build.xml

+1 −1
Original line number Diff line number Diff line
@@ -139,7 +139,7 @@ 
  <property name="testingJars"

            value="${lib.commons-logging}:${dev.junit}:${dev.jsonassert}:${dev.httpunit}:${dev.easyMock}:${dev.selenium.server}:${dev.objenesis}:${lib.js}:${lib.nekoHTML}:${lib.xerces}"/>



  <target name="test" depends="compile,compile-test">

  <target name="single-test" depends="compile,compile-test">

    <echo message="Running test suite..." />

    <junit printsummary="yes" haltonfailure="yes" fork="yes">

      <classpath>

projects/cadcAccessControl-Server/src/ca/nrc/cadc/ac/server/web/groups/AddGroupMemberAction.java

+3 −5
Original line number Diff line number Diff line
@@ -79,16 +79,15 @@ public class AddGroupMemberAction extends GroupsAction 
    private final String groupName;

    private final String groupMemberName;



    AddGroupMemberAction(GroupLogInfo logInfo, String groupName,

    AddGroupMemberAction(String groupName,

                         String groupMemberName)

    {

        super(logInfo);

        super();

        this.groupName = groupName;

        this.groupMemberName = groupMemberName;

    }



    public Object run()

        throws Exception

    public void doAction() throws Exception

    {

        GroupPersistence groupPersistence = getGroupPersistence();

        Group group = groupPersistence.getGroup(this.groupName);
@@ -102,7 +101,6 @@ public class AddGroupMemberAction extends GroupsAction 
        List<String> addedMembers = new ArrayList<String>();

        addedMembers.add(toAdd.getID());

        logGroupInfo(group.getID(), null, addedMembers);

        return null;

    }



}

projects/cadcAccessControl-Server/src/ca/nrc/cadc/ac/server/web/groups/AddUserMemberAction.java

+4 −6
Original line number Diff line number Diff line
@@ -83,18 +83,17 @@ public class AddUserMemberAction extends GroupsAction 
    private final String userID;

    private final String userIDType;



    AddUserMemberAction(GroupLogInfo logInfo, String groupName, String userID,

    AddUserMemberAction(String groupName, String userID,

                        String userIDType)

    {

        super(logInfo);

        super();

        this.groupName = groupName;

        this.userID = userID;

        this.userIDType = userIDType;

    }



    @SuppressWarnings("unchecked")

    public Object run()

        throws Exception

    public void doAction() throws Exception

    {

        GroupPersistence groupPersistence = getGroupPersistence();

        Group group = groupPersistence.getGroup(this.groupName);
@@ -110,7 +109,6 @@ public class AddUserMemberAction extends GroupsAction 
        List<String> addedMembers = new ArrayList<String>();

        addedMembers.add(toAdd.getUserID().getName());

        logGroupInfo(group.getID(), null, addedMembers);

        return null;

    }



}

projects/cadcAccessControl-Server/src/ca/nrc/cadc/ac/server/web/groups/CreateGroupAction.java

+3 −5
Original line number Diff line number Diff line
@@ -82,14 +82,13 @@ public class CreateGroupAction extends GroupsAction 
{

    private final InputStream inputStream;



    CreateGroupAction(GroupLogInfo logInfo, InputStream inputStream)

    CreateGroupAction(InputStream inputStream)

    {

        super(logInfo);

        super();

        this.inputStream = inputStream;

    }



    public Object run()

        throws Exception

    public void doAction() throws Exception

    {

        GroupPersistence groupPersistence = getGroupPersistence();

        Group group = GroupReader.read(this.inputStream);
@@ -111,7 +110,6 @@ public class CreateGroupAction extends GroupsAction 
            }

        }

        logGroupInfo(newGroup.getID(), null, addedMembers);

        return null;

    }



}

projects/cadcAccessControl-Server/src/ca/nrc/cadc/ac/server/web/groups/DeleteGroupAction.java

+3 −5
Original line number Diff line number Diff line
@@ -78,14 +78,13 @@ public class DeleteGroupAction extends GroupsAction 
{

    private final String groupName;



    DeleteGroupAction(GroupLogInfo logInfo, String groupName)

    DeleteGroupAction(String groupName)

    {

        super(logInfo);

        super();

        this.groupName = groupName;

    }



    public Object run()

        throws Exception

    public void doAction() throws Exception

    {

        GroupPersistence groupPersistence = getGroupPersistence();

        Group deletedGroup = groupPersistence.getGroup(this.groupName);
@@ -102,7 +101,6 @@ public class DeleteGroupAction extends GroupsAction 
                this.logInfo.deletedMembers.add(usr.getUserID().getName());

            }

        }

        return null;

    }



}