Juan Hernandez has uploaded a new change for review. Change subject: core: Rename AdElementParameterBase to IdParameters ......................................................................
core: Rename AdElementParameterBase to IdParameters This parameters class only contains an identifier and it doesn't have any subclasses, so it can be replaced by a simple parameters class intended to hold only an identifier. In addition to the simplification this also helps to reduce the "AD" prefixes in names. Change-Id: Ia4e465b6d5d58f2d3bcdb63322b8f707e7ed8d3d Signed-off-by: Juan Hernandez <[email protected]> --- M backend/manager/modules/bll/src/main/java/org/ovirt/engine/core/bll/AdGroupsHandlingCommandBase.java M backend/manager/modules/bll/src/main/java/org/ovirt/engine/core/bll/RemoveAdGroupCommand.java M backend/manager/modules/bll/src/main/java/org/ovirt/engine/core/bll/RemoveUserCommand.java M backend/manager/modules/bll/src/main/java/org/ovirt/engine/core/bll/UserCommandBase.java M backend/manager/modules/bll/src/test/java/org/ovirt/engine/core/bll/RemoveAdGroupCommandTest.java D backend/manager/modules/common/src/main/java/org/ovirt/engine/core/common/action/AdElementParametersBase.java A backend/manager/modules/common/src/main/java/org/ovirt/engine/core/common/action/IdParameters.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/main/java/org/ovirt/engine/api/restapi/resource/BackendUsersResource.java M backend/manager/modules/restapi/jaxrs/src/test/java/org/ovirt/engine/api/restapi/resource/BackendGroupsResourceTest.java M backend/manager/modules/restapi/jaxrs/src/test/java/org/ovirt/engine/api/restapi/resource/BackendUsersResourceTest.java M frontend/webadmin/modules/uicommonweb/src/main/java/org/ovirt/engine/ui/uicommonweb/models/users/UserListModel.java 12 files changed, 58 insertions(+), 57 deletions(-) git pull ssh://gerrit.ovirt.org:29418/ovirt-engine refs/changes/46/19946/1 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/AdGroupsHandlingCommandBase.java index 0406479..d1f94c2 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/AdGroupsHandlingCommandBase.java @@ -5,13 +5,13 @@ import org.ovirt.engine.core.bll.utils.PermissionSubject; import org.ovirt.engine.core.common.VdcObjectType; -import org.ovirt.engine.core.common.action.AdElementParametersBase; +import org.ovirt.engine.core.common.action.IdParameters; import org.ovirt.engine.core.common.businessentities.LdapGroup; import org.ovirt.engine.core.common.businessentities.tags; import org.ovirt.engine.core.compat.Guid; import org.ovirt.engine.core.dal.dbbroker.DbFacade; -public abstract class AdGroupsHandlingCommandBase<T extends AdElementParametersBase> extends CommandBase<T> { +public abstract class AdGroupsHandlingCommandBase<T extends IdParameters> extends CommandBase<T> { protected tags _tag; private LdapGroup mGroup; private String mGroupName; @@ -30,7 +30,7 @@ } protected Guid getGroupId() { - return getParameters().getAdElementId(); + return getParameters().getId(); } public String getAdGroupName() { 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/RemoveAdGroupCommand.java index 7310a3c..0dc790c 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/RemoveAdGroupCommand.java @@ -4,14 +4,14 @@ import org.ovirt.engine.core.bll.job.ExecutionHandler; import org.ovirt.engine.core.common.AuditLogType; -import org.ovirt.engine.core.common.action.AdElementParametersBase; +import org.ovirt.engine.core.common.action.IdParameters; import org.ovirt.engine.core.common.action.PermissionsOperationsParametes; import org.ovirt.engine.core.common.action.VdcActionType; import org.ovirt.engine.core.common.businessentities.permissions; import org.ovirt.engine.core.common.errors.VdcBllMessages; import org.ovirt.engine.core.compat.Guid; -public class RemoveAdGroupCommand<T extends AdElementParametersBase> extends AdGroupsHandlingCommandBase<T> { +public class RemoveAdGroupCommand<T extends IdParameters> extends AdGroupsHandlingCommandBase<T> { /** * Constructor for command creation when compensation is applied on startup @@ -46,7 +46,7 @@ @Override protected boolean canDoAction() { - Guid groupId = getParameters().getAdElementId(); + Guid groupId = getParameters().getId(); List<String> reasons = getReturnValue().getCanDoActionMessages(); boolean returnValue = true; if (isLastSuperUserGroup(groupId)) { diff --git a/backend/manager/modules/bll/src/main/java/org/ovirt/engine/core/bll/RemoveUserCommand.java b/backend/manager/modules/bll/src/main/java/org/ovirt/engine/core/bll/RemoveUserCommand.java index 04351f7..670dc4f 100644 --- a/backend/manager/modules/bll/src/main/java/org/ovirt/engine/core/bll/RemoveUserCommand.java +++ b/backend/manager/modules/bll/src/main/java/org/ovirt/engine/core/bll/RemoveUserCommand.java @@ -7,7 +7,7 @@ import org.ovirt.engine.core.common.AuditLogType; import org.ovirt.engine.core.bll.utils.PermissionSubject; import org.ovirt.engine.core.common.VdcObjectType; -import org.ovirt.engine.core.common.action.AdElementParametersBase; +import org.ovirt.engine.core.common.action.IdParameters; import org.ovirt.engine.core.common.action.PermissionsOperationsParametes; import org.ovirt.engine.core.common.action.VdcActionType; import org.ovirt.engine.core.common.businessentities.permissions; @@ -15,7 +15,7 @@ import org.ovirt.engine.core.compat.Guid; import org.ovirt.engine.core.dal.dbbroker.DbFacade; -public class RemoveUserCommand<T extends AdElementParametersBase> extends UserCommandBase<T> { +public class RemoveUserCommand<T extends IdParameters> extends UserCommandBase<T> { /** * Constructor for command creation when compensation is applied on startup @@ -64,15 +64,15 @@ @Override protected boolean canDoAction() { boolean result = true; - if (getParameters().getAdElementId().equals(PredefinedUsers.ADMIN_USER.getId())) { + if (getParameters().getId().equals(PredefinedUsers.ADMIN_USER.getId())) { addCanDoActionMessage(VdcBllMessages.USER_CANNOT_REMOVE_ADMIN_USER); result = false; } else { - if (getCurrentUser().getUserId().equals(getParameters().getAdElementId())) { + if (getCurrentUser().getUserId().equals(getParameters().getId())) { addCanDoActionMessage(VdcBllMessages.USER_CANNOT_REMOVE_HIMSELF); result = false; } else { - result = CanRemoveUser(getParameters().getAdElementId(), getReturnValue().getCanDoActionMessages()); + result = CanRemoveUser(getParameters().getId(), getReturnValue().getCanDoActionMessages()); } } return result; diff --git a/backend/manager/modules/bll/src/main/java/org/ovirt/engine/core/bll/UserCommandBase.java b/backend/manager/modules/bll/src/main/java/org/ovirt/engine/core/bll/UserCommandBase.java index 9c03e11..ccfc2eb 100644 --- a/backend/manager/modules/bll/src/main/java/org/ovirt/engine/core/bll/UserCommandBase.java +++ b/backend/manager/modules/bll/src/main/java/org/ovirt/engine/core/bll/UserCommandBase.java @@ -7,7 +7,7 @@ import org.ovirt.engine.core.bll.adbroker.LdapFactory; import org.ovirt.engine.core.bll.adbroker.LdapSearchByIdParameters; import org.ovirt.engine.core.bll.utils.PermissionSubject; -import org.ovirt.engine.core.common.action.AdElementParametersBase; +import org.ovirt.engine.core.common.action.IdParameters; import org.ovirt.engine.core.common.businessentities.LdapUser; import org.ovirt.engine.core.common.businessentities.DbUser; import org.ovirt.engine.core.common.errors.VdcBLLException; @@ -16,7 +16,7 @@ import org.ovirt.engine.core.compat.Guid; import org.ovirt.engine.core.dal.dbbroker.DbFacade; -public abstract class UserCommandBase<T extends AdElementParametersBase> extends CommandBase<T> { +public abstract class UserCommandBase<T extends IdParameters> extends CommandBase<T> { public UserCommandBase() { } @@ -52,7 +52,7 @@ } protected Guid getAdUserId() { - return getParameters().getAdElementId(); + return getParameters().getId(); } @SuppressWarnings("deprecation") 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 5922206..a17cdce 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 @@ -7,7 +7,7 @@ import org.junit.Before; import org.junit.Test; -import org.ovirt.engine.core.common.action.AdElementParametersBase; +import org.ovirt.engine.core.common.action.IdParameters; import org.ovirt.engine.core.common.errors.VdcBllMessages; import org.ovirt.engine.core.compat.Guid; @@ -16,20 +16,20 @@ /** * The command under test. */ - private RemoveAdGroupCommand<AdElementParametersBase> command; + private RemoveAdGroupCommand<IdParameters> command; private Guid adElementId = Guid.newGuid(); @Before public void initializeCommand() { - AdElementParametersBase parameters = createParameters(); - command = spy(new RemoveAdGroupCommand<AdElementParametersBase>(parameters)); + IdParameters parameters = createParameters(); + command = spy(new RemoveAdGroupCommand<IdParameters>(parameters)); } /** * @return Valid parameters for the command. */ - private AdElementParametersBase createParameters() { - return new AdElementParametersBase(adElementId); + private IdParameters createParameters() { + return new IdParameters(adElementId); } @Test diff --git a/backend/manager/modules/common/src/main/java/org/ovirt/engine/core/common/action/AdElementParametersBase.java b/backend/manager/modules/common/src/main/java/org/ovirt/engine/core/common/action/AdElementParametersBase.java deleted file mode 100644 index b64eb67..0000000 --- a/backend/manager/modules/common/src/main/java/org/ovirt/engine/core/common/action/AdElementParametersBase.java +++ /dev/null @@ -1,20 +0,0 @@ -package org.ovirt.engine.core.common.action; - -import org.ovirt.engine.core.compat.Guid; - -public class AdElementParametersBase extends VdcActionParametersBase { - private static final long serialVersionUID = -8078914032408357639L; - private Guid _adElementId; - - public AdElementParametersBase(Guid adElementId) { - _adElementId = adElementId; - } - - public Guid getAdElementId() { - return _adElementId; - } - - public AdElementParametersBase() { - _adElementId = Guid.Empty; - } -} diff --git a/backend/manager/modules/common/src/main/java/org/ovirt/engine/core/common/action/IdParameters.java b/backend/manager/modules/common/src/main/java/org/ovirt/engine/core/common/action/IdParameters.java new file mode 100644 index 0000000..aaf5157 --- /dev/null +++ b/backend/manager/modules/common/src/main/java/org/ovirt/engine/core/common/action/IdParameters.java @@ -0,0 +1,21 @@ +package org.ovirt.engine.core.common.action; + +import org.ovirt.engine.core.compat.Guid; + +public class IdParameters extends VdcActionParametersBase { + private static final long serialVersionUID = -8078914032408357639L; + + private Guid id; + + public IdParameters() { + // Nothing. + } + + public IdParameters(Guid id) { + this.id = id; + } + + public Guid getId() { + return id; + } +} 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 9c001c3..6e6b6cc 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 @@ -15,7 +15,7 @@ import org.ovirt.engine.api.model.Group; import org.ovirt.engine.api.model.Groups; import org.ovirt.engine.api.model.User; -import org.ovirt.engine.core.common.action.AdElementParametersBase; +import org.ovirt.engine.core.common.action.IdParameters; import org.ovirt.engine.core.common.action.VdcActionType; import org.ovirt.engine.core.common.businessentities.DbUser; import org.ovirt.engine.core.common.businessentities.LdapGroup; @@ -58,7 +58,7 @@ @Override public Response performRemove(String id) { - return performAction(VdcActionType.RemoveAdGroup, new AdElementParametersBase(asGuid(id))); + return performAction(VdcActionType.RemoveAdGroup, new IdParameters(asGuid(id))); } protected Groups mapDomainGroupsCollection(List<LdapGroup> entities) { diff --git a/backend/manager/modules/restapi/jaxrs/src/main/java/org/ovirt/engine/api/restapi/resource/BackendUsersResource.java b/backend/manager/modules/restapi/jaxrs/src/main/java/org/ovirt/engine/api/restapi/resource/BackendUsersResource.java index afb72de..f535c10 100644 --- a/backend/manager/modules/restapi/jaxrs/src/main/java/org/ovirt/engine/api/restapi/resource/BackendUsersResource.java +++ b/backend/manager/modules/restapi/jaxrs/src/main/java/org/ovirt/engine/api/restapi/resource/BackendUsersResource.java @@ -17,8 +17,8 @@ import org.ovirt.engine.api.model.Users; import org.ovirt.engine.api.resource.UserResource; import org.ovirt.engine.api.resource.UsersResource; -import org.ovirt.engine.core.common.action.AdElementParametersBase; import org.ovirt.engine.core.common.action.AddUserParameters; +import org.ovirt.engine.core.common.action.IdParameters; import org.ovirt.engine.core.common.action.VdcActionType; import org.ovirt.engine.core.common.businessentities.DbUser; import org.ovirt.engine.core.common.businessentities.LdapUser; @@ -143,7 +143,7 @@ @Override public Response performRemove(String id) { - return performAction(VdcActionType.RemoveUser, new AdElementParametersBase(asGuid(id))); + return performAction(VdcActionType.RemoveUser, new IdParameters(asGuid(id))); } protected Users mapDbUserCollection(List<DbUser> 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 fcb6501..04cf697 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 @@ -11,8 +11,8 @@ import org.junit.Ignore; import org.junit.Test; import org.ovirt.engine.api.model.Group; -import org.ovirt.engine.core.common.action.AdElementParametersBase; import org.ovirt.engine.core.common.action.AddUserParameters; +import org.ovirt.engine.core.common.action.IdParameters; import org.ovirt.engine.core.common.action.VdcActionType; import org.ovirt.engine.core.common.businessentities.LdapGroup; import org.ovirt.engine.core.common.businessentities.LdapRefStatus; @@ -70,8 +70,8 @@ public void testRemove() throws Exception { setUpGetEntityExpectations(); setUriInfo(setUpActionExpectations(VdcActionType.RemoveAdGroup, - AdElementParametersBase.class, - new String[] { "AdElementId" }, + IdParameters.class, + new String[] { "Id" }, new Object[] { GUIDS[0] }, true, true)); @@ -116,8 +116,8 @@ protected void doTestBadRemove(boolean canDo, boolean success, String detail) throws Exception { setUpGetEntityExpectations(); setUriInfo(setUpActionExpectations(VdcActionType.RemoveAdGroup, - AdElementParametersBase.class, - new String[] { "AdElementId" }, + IdParameters.class, + new String[] { "Id" }, new Object[] { GUIDS[0] }, canDo, success)); diff --git a/backend/manager/modules/restapi/jaxrs/src/test/java/org/ovirt/engine/api/restapi/resource/BackendUsersResourceTest.java b/backend/manager/modules/restapi/jaxrs/src/test/java/org/ovirt/engine/api/restapi/resource/BackendUsersResourceTest.java index b8a4d4d..3f1ed43 100644 --- a/backend/manager/modules/restapi/jaxrs/src/test/java/org/ovirt/engine/api/restapi/resource/BackendUsersResourceTest.java +++ b/backend/manager/modules/restapi/jaxrs/src/test/java/org/ovirt/engine/api/restapi/resource/BackendUsersResourceTest.java @@ -14,8 +14,8 @@ import org.ovirt.engine.api.model.Fault; import org.ovirt.engine.api.model.Group; import org.ovirt.engine.api.model.User; -import org.ovirt.engine.core.common.action.AdElementParametersBase; import org.ovirt.engine.core.common.action.AddUserParameters; +import org.ovirt.engine.core.common.action.IdParameters; import org.ovirt.engine.core.common.action.VdcActionType; import org.ovirt.engine.core.common.businessentities.DbUser; import org.ovirt.engine.core.common.businessentities.LdapUser; @@ -53,8 +53,8 @@ setUriInfo( setUpActionExpectations( VdcActionType.RemoveUser, - AdElementParametersBase.class, - new String[] { "AdElementId" }, + IdParameters.class, + new String[] { "Id" }, new Object[] { GUIDS[0] }, true, true @@ -108,8 +108,8 @@ setUriInfo( setUpActionExpectations( VdcActionType.RemoveUser, - AdElementParametersBase.class, - new String[] { "AdElementId" }, + IdParameters.class, + new String[] { "Id" }, new Object[] { GUIDS[0] }, canDo, success 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 c5948e6..28bc3df 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 @@ -5,9 +5,9 @@ import java.util.Map; import org.ovirt.engine.core.common.VdcActionUtils; -import org.ovirt.engine.core.common.action.AdElementParametersBase; import org.ovirt.engine.core.common.action.AddUserParameters; import org.ovirt.engine.core.common.action.AttachEntityToTagParameters; +import org.ovirt.engine.core.common.action.IdParameters; import org.ovirt.engine.core.common.action.VdcActionParametersBase; import org.ovirt.engine.core.common.action.VdcActionType; import org.ovirt.engine.core.common.businessentities.DbUser; @@ -491,11 +491,11 @@ { if (!item.isGroup()) { - userPrms.add(new AdElementParametersBase(item.getId())); + userPrms.add(new IdParameters(item.getId())); } else { - groupPrms.add(new AdElementParametersBase(item.getId())); + groupPrms.add(new IdParameters(item.getId())); } } -- To view, visit http://gerrit.ovirt.org/19946 To unsubscribe, visit http://gerrit.ovirt.org/settings Gerrit-MessageType: newchange Gerrit-Change-Id: Ia4e465b6d5d58f2d3bcdb63322b8f707e7ed8d3d 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
