Juan Hernandez has uploaded a new change for review. Change subject: core, restapi, webadmin: Remove AttachVdsToTagParameters ......................................................................
core, restapi, webadmin: Remove AttachVdsToTagParameters There is a more generic AttachEntityToTagParameters class that servers exactly the same purpose, using it enables simplification of the RESTAPI resources related to tags. Change-Id: I497d4ec54023260224627ca03bf837cd8aa4fb6a Signed-off-by: Juan Hernandez <[email protected]> --- M backend/manager/modules/bll/src/main/java/org/ovirt/engine/core/bll/AttachVdsToTagCommand.java M backend/manager/modules/bll/src/main/java/org/ovirt/engine/core/bll/DetachVdsFromTagCommand.java M backend/manager/modules/bll/src/main/java/org/ovirt/engine/core/bll/VdsTagMapBase.java D backend/manager/modules/common/src/main/java/org/ovirt/engine/core/common/action/AttachVdsToTagParameters.java M backend/manager/modules/restapi/jaxrs/src/main/java/org/ovirt/engine/api/restapi/resource/BackendHostTagsResource.java M backend/manager/modules/restapi/jaxrs/src/test/java/org/ovirt/engine/api/restapi/resource/BackendHostTagsResourceTest.java M frontend/webadmin/modules/uicommonweb/src/main/java/org/ovirt/engine/ui/uicommonweb/models/hosts/HostListModel.java 7 files changed, 14 insertions(+), 35 deletions(-) git pull ssh://gerrit.ovirt.org:29418/ovirt-engine refs/changes/81/41981/1 diff --git a/backend/manager/modules/bll/src/main/java/org/ovirt/engine/core/bll/AttachVdsToTagCommand.java b/backend/manager/modules/bll/src/main/java/org/ovirt/engine/core/bll/AttachVdsToTagCommand.java index 9f60423..0481c5e 100644 --- a/backend/manager/modules/bll/src/main/java/org/ovirt/engine/core/bll/AttachVdsToTagCommand.java +++ b/backend/manager/modules/bll/src/main/java/org/ovirt/engine/core/bll/AttachVdsToTagCommand.java @@ -1,13 +1,13 @@ package org.ovirt.engine.core.bll; import org.ovirt.engine.core.common.AuditLogType; -import org.ovirt.engine.core.common.action.AttachVdsToTagParameters; +import org.ovirt.engine.core.common.action.AttachEntityToTagParameters; import org.ovirt.engine.core.common.businessentities.VDS; import org.ovirt.engine.core.common.businessentities.TagsVdsMap; import org.ovirt.engine.core.compat.Guid; import org.ovirt.engine.core.dal.dbbroker.DbFacade; -public class AttachVdsToTagCommand<T extends AttachVdsToTagParameters> extends VdsTagMapBase<T> { +public class AttachVdsToTagCommand<T extends AttachEntityToTagParameters> extends VdsTagMapBase<T> { public AttachVdsToTagCommand(T parameters) { super(parameters); diff --git a/backend/manager/modules/bll/src/main/java/org/ovirt/engine/core/bll/DetachVdsFromTagCommand.java b/backend/manager/modules/bll/src/main/java/org/ovirt/engine/core/bll/DetachVdsFromTagCommand.java index ad1378f..44ebd61 100644 --- a/backend/manager/modules/bll/src/main/java/org/ovirt/engine/core/bll/DetachVdsFromTagCommand.java +++ b/backend/manager/modules/bll/src/main/java/org/ovirt/engine/core/bll/DetachVdsFromTagCommand.java @@ -1,12 +1,12 @@ package org.ovirt.engine.core.bll; import org.ovirt.engine.core.common.AuditLogType; -import org.ovirt.engine.core.common.action.AttachVdsToTagParameters; +import org.ovirt.engine.core.common.action.AttachEntityToTagParameters; import org.ovirt.engine.core.common.businessentities.VDS; import org.ovirt.engine.core.compat.Guid; import org.ovirt.engine.core.dal.dbbroker.DbFacade; -public class DetachVdsFromTagCommand<T extends AttachVdsToTagParameters> extends VdsTagMapBase<T> { +public class DetachVdsFromTagCommand<T extends AttachEntityToTagParameters> extends VdsTagMapBase<T> { public DetachVdsFromTagCommand(T parameters) { super(parameters); diff --git a/backend/manager/modules/bll/src/main/java/org/ovirt/engine/core/bll/VdsTagMapBase.java b/backend/manager/modules/bll/src/main/java/org/ovirt/engine/core/bll/VdsTagMapBase.java index 98bc187..49b15a2 100644 --- a/backend/manager/modules/bll/src/main/java/org/ovirt/engine/core/bll/VdsTagMapBase.java +++ b/backend/manager/modules/bll/src/main/java/org/ovirt/engine/core/bll/VdsTagMapBase.java @@ -1,11 +1,12 @@ package org.ovirt.engine.core.bll; import java.util.ArrayList; -import org.ovirt.engine.core.common.action.AttachVdsToTagParameters; + +import org.ovirt.engine.core.common.action.AttachEntityToTagParameters; import org.ovirt.engine.core.common.errors.VdcBllMessages; import org.ovirt.engine.core.compat.Guid; -public abstract class VdsTagMapBase<T extends AttachVdsToTagParameters> extends TagsCommandBase<T> { +public abstract class VdsTagMapBase<T extends AttachEntityToTagParameters> extends TagsCommandBase<T> { protected ArrayList<Guid> getVdsList() { return getParameters().getEntitiesId(); } diff --git a/backend/manager/modules/common/src/main/java/org/ovirt/engine/core/common/action/AttachVdsToTagParameters.java b/backend/manager/modules/common/src/main/java/org/ovirt/engine/core/common/action/AttachVdsToTagParameters.java deleted file mode 100644 index 49f35b8..0000000 --- a/backend/manager/modules/common/src/main/java/org/ovirt/engine/core/common/action/AttachVdsToTagParameters.java +++ /dev/null @@ -1,22 +0,0 @@ -package org.ovirt.engine.core.common.action; - -import java.util.ArrayList; - -import org.ovirt.engine.core.compat.Guid; - -public class AttachVdsToTagParameters extends TagsActionParametersBase { - private static final long serialVersionUID = -6599471346607548452L; - private ArrayList<Guid> _entitiesId; - - public AttachVdsToTagParameters(Guid tagId, ArrayList<Guid> entitiesId) { - super(tagId); - _entitiesId = entitiesId; - } - - public ArrayList<Guid> getEntitiesId() { - return _entitiesId == null ? new ArrayList<Guid>() : _entitiesId; - } - - public AttachVdsToTagParameters() { - } -} diff --git a/backend/manager/modules/restapi/jaxrs/src/main/java/org/ovirt/engine/api/restapi/resource/BackendHostTagsResource.java b/backend/manager/modules/restapi/jaxrs/src/main/java/org/ovirt/engine/api/restapi/resource/BackendHostTagsResource.java index 654a5a8..6f488eb 100644 --- a/backend/manager/modules/restapi/jaxrs/src/main/java/org/ovirt/engine/api/restapi/resource/BackendHostTagsResource.java +++ b/backend/manager/modules/restapi/jaxrs/src/main/java/org/ovirt/engine/api/restapi/resource/BackendHostTagsResource.java @@ -6,7 +6,7 @@ import org.ovirt.engine.api.model.Tag; import org.ovirt.engine.api.resource.AssignedTagsResource; import org.ovirt.engine.core.common.businessentities.Tags; -import org.ovirt.engine.core.common.action.AttachVdsToTagParameters; +import org.ovirt.engine.core.common.action.AttachEntityToTagParameters; import org.ovirt.engine.core.common.action.TagsActionParametersBase; import org.ovirt.engine.core.common.action.VdcActionType; import org.ovirt.engine.core.common.queries.GetTagsByVdsIdParameters; @@ -25,7 +25,7 @@ } protected TagsActionParametersBase getAttachParams(String id) { - return new AttachVdsToTagParameters(asGuid(id), asList(asGuid(parentId))); + return new AttachEntityToTagParameters(asGuid(id), asList(asGuid(parentId))); } @Override diff --git a/backend/manager/modules/restapi/jaxrs/src/test/java/org/ovirt/engine/api/restapi/resource/BackendHostTagsResourceTest.java b/backend/manager/modules/restapi/jaxrs/src/test/java/org/ovirt/engine/api/restapi/resource/BackendHostTagsResourceTest.java index e4af3e9..f8b2772 100644 --- a/backend/manager/modules/restapi/jaxrs/src/test/java/org/ovirt/engine/api/restapi/resource/BackendHostTagsResourceTest.java +++ b/backend/manager/modules/restapi/jaxrs/src/test/java/org/ovirt/engine/api/restapi/resource/BackendHostTagsResourceTest.java @@ -2,7 +2,7 @@ import org.ovirt.engine.core.common.queries.GetTagsByVdsIdParameters; import org.ovirt.engine.core.common.queries.VdcQueryType; -import org.ovirt.engine.core.common.action.AttachVdsToTagParameters; +import org.ovirt.engine.core.common.action.AttachEntityToTagParameters; import org.ovirt.engine.core.common.action.VdcActionType; public class BackendHostTagsResourceTest extends AbstractBackendAssignedTagsResourceTest<BackendHostTagsResource> { @@ -13,6 +13,6 @@ queryParams = GetTagsByVdsIdParameters.class; attachAction = VdcActionType.AttachVdsToTag; detachAction = VdcActionType.DetachVdsFromTag; - attachParams = AttachVdsToTagParameters.class; + attachParams = AttachEntityToTagParameters.class; } } diff --git a/frontend/webadmin/modules/uicommonweb/src/main/java/org/ovirt/engine/ui/uicommonweb/models/hosts/HostListModel.java b/frontend/webadmin/modules/uicommonweb/src/main/java/org/ovirt/engine/ui/uicommonweb/models/hosts/HostListModel.java index bf8d97a..1b11561 100644 --- a/frontend/webadmin/modules/uicommonweb/src/main/java/org/ovirt/engine/ui/uicommonweb/models/hosts/HostListModel.java +++ b/frontend/webadmin/modules/uicommonweb/src/main/java/org/ovirt/engine/ui/uicommonweb/models/hosts/HostListModel.java @@ -14,7 +14,7 @@ import org.ovirt.engine.core.common.VdcActionUtils; import org.ovirt.engine.core.common.VdcObjectType; -import org.ovirt.engine.core.common.action.AttachVdsToTagParameters; +import org.ovirt.engine.core.common.action.AttachEntityToTagParameters; import org.ovirt.engine.core.common.action.ChangeVDSClusterParameters; import org.ovirt.engine.core.common.action.FenceVdsActionParameters; import org.ovirt.engine.core.common.action.FenceVdsManualyParameters; @@ -592,14 +592,14 @@ ArrayList<VdcActionParametersBase> prmsToAttach = new ArrayList<VdcActionParametersBase>(); for (Guid tag_id : tagsToAttach) { - prmsToAttach.add(new AttachVdsToTagParameters(tag_id, hostIds)); + prmsToAttach.add(new AttachEntityToTagParameters(tag_id, hostIds)); } Frontend.getInstance().runMultipleAction(VdcActionType.AttachVdsToTag, prmsToAttach); ArrayList<VdcActionParametersBase> prmsToDetach = new ArrayList<VdcActionParametersBase>(); for (Guid tag_id : tagsToDetach) { - prmsToDetach.add(new AttachVdsToTagParameters(tag_id, hostIds)); + prmsToDetach.add(new AttachEntityToTagParameters(tag_id, hostIds)); } Frontend.getInstance().runMultipleAction(VdcActionType.DetachVdsFromTag, prmsToDetach); -- To view, visit https://gerrit.ovirt.org/41981 To unsubscribe, visit https://gerrit.ovirt.org/settings Gerrit-MessageType: newchange Gerrit-Change-Id: I497d4ec54023260224627ca03bf837cd8aa4fb6a 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
