Juan Hernandez has uploaded a new change for review. Change subject: core: Remove AD prefix from group commands ......................................................................
core: Remove AD prefix from group commands We used to have the AD prefix in the names of the commands used to manage groups because they used to work with Active Directory, but we support now multiple directories, so this prefix isn't correct. Change-Id: I582d6aebe93b4b4deffc1ebb7ce2df2bc5ad1c79 Signed-off-by: Juan Hernandez <[email protected]> --- M backend/manager/modules/bll/src/main/java/org/ovirt/engine/core/bll/AddPermissionCommand.java M backend/manager/modules/bll/src/main/java/org/ovirt/engine/core/bll/AddUserCommand.java R backend/manager/modules/bll/src/main/java/org/ovirt/engine/core/bll/GroupCommandBase.java R backend/manager/modules/bll/src/main/java/org/ovirt/engine/core/bll/RemoveGroupCommand.java M backend/manager/modules/bll/src/test/java/org/ovirt/engine/core/bll/RemoveAdGroupCommandTest.java M backend/manager/modules/common/src/main/java/org/ovirt/engine/core/common/action/VdcActionType.java M backend/manager/modules/restapi/jaxrs/src/main/java/org/ovirt/engine/api/restapi/resource/BackendGroupsResourceBase.java M backend/manager/modules/restapi/jaxrs/src/test/java/org/ovirt/engine/api/restapi/resource/BackendGroupsResourceTest.java M frontend/webadmin/modules/uicommonweb/src/main/java/org/ovirt/engine/ui/uicommonweb/models/users/UserListModel.java 9 files changed, 15 insertions(+), 15 deletions(-) git pull ssh://gerrit.ovirt.org:29418/ovirt-engine refs/changes/48/19948/1 diff --git a/backend/manager/modules/bll/src/main/java/org/ovirt/engine/core/bll/AddPermissionCommand.java b/backend/manager/modules/bll/src/main/java/org/ovirt/engine/core/bll/AddPermissionCommand.java index 76bf4ad..c68d436 100644 --- a/backend/manager/modules/bll/src/main/java/org/ovirt/engine/core/bll/AddPermissionCommand.java +++ b/backend/manager/modules/bll/src/main/java/org/ovirt/engine/core/bll/AddPermissionCommand.java @@ -101,7 +101,7 @@ } // try to add group to db if adGroup sent else if (getParameters().getAdGroup() != null) { - _adGroup = AdGroupsHandlingCommandBase.initAdGroup(getParameters().getAdGroup()); + _adGroup = GroupCommandBase.initAdGroup(getParameters().getAdGroup()); } paramPermission.setId(Guid.newGuid()); diff --git a/backend/manager/modules/bll/src/main/java/org/ovirt/engine/core/bll/AddUserCommand.java b/backend/manager/modules/bll/src/main/java/org/ovirt/engine/core/bll/AddUserCommand.java index 7947156..60c5c75 100644 --- a/backend/manager/modules/bll/src/main/java/org/ovirt/engine/core/bll/AddUserCommand.java +++ b/backend/manager/modules/bll/src/main/java/org/ovirt/engine/core/bll/AddUserCommand.java @@ -82,7 +82,7 @@ } // try to add group to db if adGroup sent else if (getParameters().getAdGroup() != null) { - AdGroupsHandlingCommandBase.initAdGroup(getParameters().getAdGroup()); + GroupCommandBase.initAdGroup(getParameters().getAdGroup()); } setSucceeded(true); } diff --git a/backend/manager/modules/bll/src/main/java/org/ovirt/engine/core/bll/AdGroupsHandlingCommandBase.java b/backend/manager/modules/bll/src/main/java/org/ovirt/engine/core/bll/GroupCommandBase.java similarity index 89% rename from backend/manager/modules/bll/src/main/java/org/ovirt/engine/core/bll/AdGroupsHandlingCommandBase.java rename to backend/manager/modules/bll/src/main/java/org/ovirt/engine/core/bll/GroupCommandBase.java index d1f94c2..280d7e2 100644 --- a/backend/manager/modules/bll/src/main/java/org/ovirt/engine/core/bll/AdGroupsHandlingCommandBase.java +++ b/backend/manager/modules/bll/src/main/java/org/ovirt/engine/core/bll/GroupCommandBase.java @@ -11,7 +11,7 @@ import org.ovirt.engine.core.compat.Guid; import org.ovirt.engine.core.dal.dbbroker.DbFacade; -public abstract class AdGroupsHandlingCommandBase<T extends IdParameters> extends CommandBase<T> { +public abstract class GroupCommandBase<T extends IdParameters> extends CommandBase<T> { protected tags _tag; private LdapGroup mGroup; private String mGroupName; @@ -21,11 +21,11 @@ * * @param commandId */ - protected AdGroupsHandlingCommandBase(Guid commandId) { + protected GroupCommandBase(Guid commandId) { super(commandId); } - public AdGroupsHandlingCommandBase(T parameters) { + public GroupCommandBase(T parameters) { super(parameters); } diff --git a/backend/manager/modules/bll/src/main/java/org/ovirt/engine/core/bll/RemoveAdGroupCommand.java b/backend/manager/modules/bll/src/main/java/org/ovirt/engine/core/bll/RemoveGroupCommand.java similarity index 91% rename from backend/manager/modules/bll/src/main/java/org/ovirt/engine/core/bll/RemoveAdGroupCommand.java rename to backend/manager/modules/bll/src/main/java/org/ovirt/engine/core/bll/RemoveGroupCommand.java index 0dc790c..dd39634 100644 --- a/backend/manager/modules/bll/src/main/java/org/ovirt/engine/core/bll/RemoveAdGroupCommand.java +++ b/backend/manager/modules/bll/src/main/java/org/ovirt/engine/core/bll/RemoveGroupCommand.java @@ -11,18 +11,18 @@ import org.ovirt.engine.core.common.errors.VdcBllMessages; import org.ovirt.engine.core.compat.Guid; -public class RemoveAdGroupCommand<T extends IdParameters> extends AdGroupsHandlingCommandBase<T> { +public class RemoveGroupCommand<T extends IdParameters> extends GroupCommandBase<T> { /** * Constructor for command creation when compensation is applied on startup * * @param commandId */ - protected RemoveAdGroupCommand(Guid commandId) { + protected RemoveGroupCommand(Guid commandId) { super(commandId); } - public RemoveAdGroupCommand(T parameters) { + public RemoveGroupCommand(T parameters) { super(parameters); } diff --git a/backend/manager/modules/bll/src/test/java/org/ovirt/engine/core/bll/RemoveAdGroupCommandTest.java b/backend/manager/modules/bll/src/test/java/org/ovirt/engine/core/bll/RemoveAdGroupCommandTest.java index a17cdce..70f299c 100644 --- a/backend/manager/modules/bll/src/test/java/org/ovirt/engine/core/bll/RemoveAdGroupCommandTest.java +++ b/backend/manager/modules/bll/src/test/java/org/ovirt/engine/core/bll/RemoveAdGroupCommandTest.java @@ -16,13 +16,13 @@ /** * The command under test. */ - private RemoveAdGroupCommand<IdParameters> command; + private RemoveGroupCommand<IdParameters> command; private Guid adElementId = Guid.newGuid(); @Before public void initializeCommand() { IdParameters parameters = createParameters(); - command = spy(new RemoveAdGroupCommand<IdParameters>(parameters)); + command = spy(new RemoveGroupCommand<IdParameters>(parameters)); } /** diff --git a/backend/manager/modules/common/src/main/java/org/ovirt/engine/core/common/action/VdcActionType.java b/backend/manager/modules/common/src/main/java/org/ovirt/engine/core/common/action/VdcActionType.java index aa9d7cd..682805c 100644 --- a/backend/manager/modules/common/src/main/java/org/ovirt/engine/core/common/action/VdcActionType.java +++ b/backend/manager/modules/common/src/main/java/org/ovirt/engine/core/common/action/VdcActionType.java @@ -138,7 +138,7 @@ LoginUser(406, ActionGroup.LOGIN, false, QuotaDependency.NONE), LogoutUser(408, false, QuotaDependency.NONE), RemoveUser(409, ActionGroup.MANIPULATE_USERS, false, QuotaDependency.NONE), - RemoveAdGroup(415, ActionGroup.MANIPULATE_USERS, false, QuotaDependency.NONE), + RemoveGroup(415, ActionGroup.MANIPULATE_USERS, false, QuotaDependency.NONE), ChangeUserPassword(416, QuotaDependency.NONE), LoginAdminUser(418, ActionGroup.LOGIN, false, QuotaDependency.NONE), AddUser(419, ActionGroup.MANIPULATE_USERS, false, QuotaDependency.NONE), diff --git a/backend/manager/modules/restapi/jaxrs/src/main/java/org/ovirt/engine/api/restapi/resource/BackendGroupsResourceBase.java b/backend/manager/modules/restapi/jaxrs/src/main/java/org/ovirt/engine/api/restapi/resource/BackendGroupsResourceBase.java index 6e6b6cc..13ad353 100644 --- a/backend/manager/modules/restapi/jaxrs/src/main/java/org/ovirt/engine/api/restapi/resource/BackendGroupsResourceBase.java +++ b/backend/manager/modules/restapi/jaxrs/src/main/java/org/ovirt/engine/api/restapi/resource/BackendGroupsResourceBase.java @@ -58,7 +58,7 @@ @Override public Response performRemove(String id) { - return performAction(VdcActionType.RemoveAdGroup, new IdParameters(asGuid(id))); + return performAction(VdcActionType.RemoveGroup, new IdParameters(asGuid(id))); } protected Groups mapDomainGroupsCollection(List<LdapGroup> entities) { diff --git a/backend/manager/modules/restapi/jaxrs/src/test/java/org/ovirt/engine/api/restapi/resource/BackendGroupsResourceTest.java b/backend/manager/modules/restapi/jaxrs/src/test/java/org/ovirt/engine/api/restapi/resource/BackendGroupsResourceTest.java index 04cf697..0ef4803 100644 --- a/backend/manager/modules/restapi/jaxrs/src/test/java/org/ovirt/engine/api/restapi/resource/BackendGroupsResourceTest.java +++ b/backend/manager/modules/restapi/jaxrs/src/test/java/org/ovirt/engine/api/restapi/resource/BackendGroupsResourceTest.java @@ -69,7 +69,7 @@ @Test public void testRemove() throws Exception { setUpGetEntityExpectations(); - setUriInfo(setUpActionExpectations(VdcActionType.RemoveAdGroup, + setUriInfo(setUpActionExpectations(VdcActionType.RemoveGroup, IdParameters.class, new String[] { "Id" }, new Object[] { GUIDS[0] }, @@ -115,7 +115,7 @@ protected void doTestBadRemove(boolean canDo, boolean success, String detail) throws Exception { setUpGetEntityExpectations(); - setUriInfo(setUpActionExpectations(VdcActionType.RemoveAdGroup, + setUriInfo(setUpActionExpectations(VdcActionType.RemoveGroup, IdParameters.class, new String[] { "Id" }, new Object[] { GUIDS[0] }, diff --git a/frontend/webadmin/modules/uicommonweb/src/main/java/org/ovirt/engine/ui/uicommonweb/models/users/UserListModel.java b/frontend/webadmin/modules/uicommonweb/src/main/java/org/ovirt/engine/ui/uicommonweb/models/users/UserListModel.java index 28bc3df..7454088 100644 --- a/frontend/webadmin/modules/uicommonweb/src/main/java/org/ovirt/engine/ui/uicommonweb/models/users/UserListModel.java +++ b/frontend/webadmin/modules/uicommonweb/src/main/java/org/ovirt/engine/ui/uicommonweb/models/users/UserListModel.java @@ -507,7 +507,7 @@ if (groupPrms.size() > 0) { - Frontend.RunMultipleAction(VdcActionType.RemoveAdGroup, groupPrms); + Frontend.RunMultipleAction(VdcActionType.RemoveGroup, groupPrms); } cancel(); -- To view, visit http://gerrit.ovirt.org/19948 To unsubscribe, visit http://gerrit.ovirt.org/settings Gerrit-MessageType: newchange Gerrit-Change-Id: I582d6aebe93b4b4deffc1ebb7ce2df2bc5ad1c79 Gerrit-PatchSet: 1 Gerrit-Project: ovirt-engine Gerrit-Branch: master Gerrit-Owner: Juan Hernandez <[email protected]> _______________________________________________ Engine-patches mailing list [email protected] http://lists.ovirt.org/mailman/listinfo/engine-patches
