Allon Mureinik has uploaded a new change for review. Change subject: core: Remove unused GetVmsByVmTemplateGuidQuery ......................................................................
core: Remove unused GetVmsByVmTemplateGuidQuery GetVmsByVmTemplateGuidQuery is not used anywhere in the code, and hence should be removed. This patch removes the following: 1. The unused GetVmsByVmTemplateGuidQuery class. 2. The GetVmsByVmTemplateGuidParameters class used by the aforementioned query class. All its meaningful methods (i.e., getId() and the constructor from Guid were pulled up to GetVmTemplatesDisksParameters which used to extend it. 3. The GetVmsByVmTemplateGuid constant in VdcQueryType corresponding to the removed class. Change-Id: Ieef493712c75bc386dce066f9774ffe83c1be8fa Signed-off-by: Allon Mureinik <amure...@redhat.com> --- D backend/manager/modules/bll/src/main/java/org/ovirt/engine/core/bll/GetVmsByVmTemplateGuidQuery.java M backend/manager/modules/common/src/main/java/org/ovirt/engine/core/common/queries/GetVmTemplatesDisksParameters.java D backend/manager/modules/common/src/main/java/org/ovirt/engine/core/common/queries/GetVmsByVmTemplateGuidParameters.java M backend/manager/modules/common/src/main/java/org/ovirt/engine/core/common/queries/VdcQueryType.java 4 files changed, 9 insertions(+), 42 deletions(-) git pull ssh://gerrit.ovirt.org:29418/ovirt-engine refs/changes/81/13281/1 diff --git a/backend/manager/modules/bll/src/main/java/org/ovirt/engine/core/bll/GetVmsByVmTemplateGuidQuery.java b/backend/manager/modules/bll/src/main/java/org/ovirt/engine/core/bll/GetVmsByVmTemplateGuidQuery.java deleted file mode 100644 index 911a4cd..0000000 --- a/backend/manager/modules/bll/src/main/java/org/ovirt/engine/core/bll/GetVmsByVmTemplateGuidQuery.java +++ /dev/null @@ -1,17 +0,0 @@ -package org.ovirt.engine.core.bll; - -import org.ovirt.engine.core.common.queries.*; -import org.ovirt.engine.core.dal.dbbroker.*; - -public class GetVmsByVmTemplateGuidQuery<P extends GetVmsByVmTemplateGuidParameters> extends QueriesCommandBase<P> { - public GetVmsByVmTemplateGuidQuery(P parameters) { - super(parameters); - } - - @Override - protected void executeQueryCommand() { - getQueryReturnValue().setReturnValue(DbFacade.getInstance() - .getVmDao() - .getAllWithTemplate(getParameters().getId())); - } -} diff --git a/backend/manager/modules/common/src/main/java/org/ovirt/engine/core/common/queries/GetVmTemplatesDisksParameters.java b/backend/manager/modules/common/src/main/java/org/ovirt/engine/core/common/queries/GetVmTemplatesDisksParameters.java index 6d47d00..a59708c 100644 --- a/backend/manager/modules/common/src/main/java/org/ovirt/engine/core/common/queries/GetVmTemplatesDisksParameters.java +++ b/backend/manager/modules/common/src/main/java/org/ovirt/engine/core/common/queries/GetVmTemplatesDisksParameters.java @@ -1,14 +1,19 @@ package org.ovirt.engine.core.common.queries; -import org.ovirt.engine.core.compat.*; +import org.ovirt.engine.core.compat.Guid; -public class GetVmTemplatesDisksParameters extends GetVmsByVmTemplateGuidParameters { - private static final long serialVersionUID = -4340274643795202346L; +public class GetVmTemplatesDisksParameters extends VdcQueryParametersBase { + private static final long serialVersionUID = 4859370588871811757L; + private Guid id = new Guid(); public GetVmTemplatesDisksParameters(Guid vmTemplateId) { - super(vmTemplateId); + id = vmTemplateId; } public GetVmTemplatesDisksParameters() { } + + public Guid getId() { + return id; + } } diff --git a/backend/manager/modules/common/src/main/java/org/ovirt/engine/core/common/queries/GetVmsByVmTemplateGuidParameters.java b/backend/manager/modules/common/src/main/java/org/ovirt/engine/core/common/queries/GetVmsByVmTemplateGuidParameters.java deleted file mode 100644 index 5183756..0000000 --- a/backend/manager/modules/common/src/main/java/org/ovirt/engine/core/common/queries/GetVmsByVmTemplateGuidParameters.java +++ /dev/null @@ -1,20 +0,0 @@ -package org.ovirt.engine.core.common.queries; - -import org.ovirt.engine.core.compat.*; - -public class GetVmsByVmTemplateGuidParameters extends VdcQueryParametersBase { - private static final long serialVersionUID = -4308515803583157101L; - - public GetVmsByVmTemplateGuidParameters(Guid id) { - _id = id; - } - - private Guid _id = new Guid(); - - public Guid getId() { - return _id; - } - - public GetVmsByVmTemplateGuidParameters() { - } -} diff --git a/backend/manager/modules/common/src/main/java/org/ovirt/engine/core/common/queries/VdcQueryType.java b/backend/manager/modules/common/src/main/java/org/ovirt/engine/core/common/queries/VdcQueryType.java index 461e136..2ff8fd5 100644 --- a/backend/manager/modules/common/src/main/java/org/ovirt/engine/core/common/queries/VdcQueryType.java +++ b/backend/manager/modules/common/src/main/java/org/ovirt/engine/core/common/queries/VdcQueryType.java @@ -77,7 +77,6 @@ IsVmTemlateWithSameNameExist(VdcQueryAuthType.User), GetVmTemplate(VdcQueryAuthType.User), GetAllVmTemplates(VdcQueryAuthType.User), - GetVmsByVmTemplateGuid, GetVmTemplatesDisks(VdcQueryAuthType.User), GetVmTemplatesByStoragePoolId, GetVmTemplatesByImageGuid, -- To view, visit http://gerrit.ovirt.org/13281 To unsubscribe, visit http://gerrit.ovirt.org/settings Gerrit-MessageType: newchange Gerrit-Change-Id: Ieef493712c75bc386dce066f9774ffe83c1be8fa Gerrit-PatchSet: 1 Gerrit-Project: ovirt-engine Gerrit-Branch: master Gerrit-Owner: Allon Mureinik <amure...@redhat.com> _______________________________________________ Engine-patches mailing list Engine-patches@ovirt.org http://lists.ovirt.org/mailman/listinfo/engine-patches