Daniel Erez has uploaded a new change for review.
Change subject: core: remove obsolete StorageDomainTemplateQuery
......................................................................
core: remove obsolete StorageDomainTemplateQuery
Cleanup - removing obsolete query: StorageDomainTemplateQuery
Change-Id: I9e090b64dd8b47a9c79dc8ad6a1c3caab62031b6
Signed-off-by: Daniel Erez <de...@redhat.com>
---
M backend/manager/dbscripts/disk_images_sp.sql
D
backend/manager/modules/bll/src/main/java/org/ovirt/engine/core/bll/GetImagesByStorageDomainAndTemplateQuery.java
D
backend/manager/modules/common/src/main/java/org/ovirt/engine/core/common/queries/StorageDomainTemplateQueryParameters.java
M
backend/manager/modules/common/src/main/java/org/ovirt/engine/core/common/queries/VdcQueryType.java
M
backend/manager/modules/dal/src/main/java/org/ovirt/engine/core/dao/DiskImageDAO.java
M
backend/manager/modules/dal/src/main/java/org/ovirt/engine/core/dao/DiskImageDAODbFacadeImpl.java
M
backend/manager/modules/dal/src/main/java/org/ovirt/engine/core/dao/DiskImageDAOWrapperImpl.java
M
backend/manager/modules/dal/src/test/java/org/ovirt/engine/core/dao/DiskImageDAOTest.java
8 files changed, 0 insertions(+), 106 deletions(-)
git pull ssh://gerrit.ovirt.org:29418/ovirt-engine refs/changes/20/10320/1
diff --git a/backend/manager/dbscripts/disk_images_sp.sql
b/backend/manager/dbscripts/disk_images_sp.sql
index 12bbcea..656c207 100644
--- a/backend/manager/dbscripts/disk_images_sp.sql
+++ b/backend/manager/dbscripts/disk_images_sp.sql
@@ -136,24 +136,6 @@
LANGUAGE plpgsql;
-Create or replace FUNCTION GetImageByStorageIdAndTemplateId(v_storage_id UUID,
v_template_id UUID)
-RETURNS SETOF images_storage_domain_view
- AS $procedure$
-BEGIN
- IF v_template_id IS NULL then
- RETURN QUERY SELECT images_storage_domain_view.*
- FROM images_storage_domain_view
- WHERE images_storage_domain_view.storage_id = v_storage_id AND
images_storage_domain_view.entity_type::text = 'TEMPLATE'::text;
- ELSE
- RETURN QUERY SELECT images_storage_domain_view.*
- FROM images_storage_domain_view
- JOIN vm_device ON vm_device.device_id =
images_storage_domain_view.disk_id
- WHERE images_storage_domain_view.storage_id = v_storage_id
- AND vm_device.vm_id = v_template_id
- AND images_storage_domain_view.entity_type::text =
'TEMPLATE'::text;
- END IF;
-END; $procedure$
-LANGUAGE plpgsql;
Create or replace FUNCTION GetImagesWhichHaveNoDisk(v_vm_id UUID)
diff --git
a/backend/manager/modules/bll/src/main/java/org/ovirt/engine/core/bll/GetImagesByStorageDomainAndTemplateQuery.java
b/backend/manager/modules/bll/src/main/java/org/ovirt/engine/core/bll/GetImagesByStorageDomainAndTemplateQuery.java
deleted file mode 100644
index 8cf02b2..0000000
---
a/backend/manager/modules/bll/src/main/java/org/ovirt/engine/core/bll/GetImagesByStorageDomainAndTemplateQuery.java
+++ /dev/null
@@ -1,21 +0,0 @@
-package org.ovirt.engine.core.bll;
-
-import
org.ovirt.engine.core.common.queries.StorageDomainTemplateQueryParameters;
-import org.ovirt.engine.core.dal.dbbroker.DbFacade;
-
-public class GetImagesByStorageDomainAndTemplateQuery<P extends
StorageDomainTemplateQueryParameters> extends QueriesCommandBase<P> {
-
- public GetImagesByStorageDomainAndTemplateQuery(P parameters) {
- super(parameters);
- }
-
- @Override
- protected void executeQueryCommand() {
- getQueryReturnValue().setReturnValue(DbFacade.getInstance()
- .getDiskImageDao()
-
.getImagesByStorageIdAndTemplateId(getParameters().getStorageDomainId(),
- getParameters().getTemplateId()));
-
- }
-
-}
diff --git
a/backend/manager/modules/common/src/main/java/org/ovirt/engine/core/common/queries/StorageDomainTemplateQueryParameters.java
b/backend/manager/modules/common/src/main/java/org/ovirt/engine/core/common/queries/StorageDomainTemplateQueryParameters.java
deleted file mode 100644
index 162fad5..0000000
---
a/backend/manager/modules/common/src/main/java/org/ovirt/engine/core/common/queries/StorageDomainTemplateQueryParameters.java
+++ /dev/null
@@ -1,27 +0,0 @@
-package org.ovirt.engine.core.common.queries;
-
-import org.ovirt.engine.core.compat.Guid;
-
-public class StorageDomainTemplateQueryParameters extends
StorageDomainQueryParametersBase {
-
- private static final long serialVersionUID = 3787908881298340953L;
- private Guid templateId;
-
- public StorageDomainTemplateQueryParameters(Guid storageId) {
- this(storageId, null);
- }
-
- public StorageDomainTemplateQueryParameters(Guid storageId, Guid
templateId) {
- super(storageId);
- this.templateId = templateId;
- }
-
- public void setTemplateId(Guid templateId) {
- this.templateId = templateId;
- }
-
- public Guid getTemplateId() {
- return templateId;
- }
-
-}
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 54b5714..be6a423 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
@@ -96,7 +96,6 @@
GetAllDisks,
GetImageByImageId,
GetDiskByDiskId,
- GetImagesByStorageDomainAndTemplate,
// Users queries
GetUserVmsByUserIdAndGroups(VdcQueryAuthType.User),
diff --git
a/backend/manager/modules/dal/src/main/java/org/ovirt/engine/core/dao/DiskImageDAO.java
b/backend/manager/modules/dal/src/main/java/org/ovirt/engine/core/dao/DiskImageDAO.java
index 3b6bd43..6c35574 100644
---
a/backend/manager/modules/dal/src/main/java/org/ovirt/engine/core/dao/DiskImageDAO.java
+++
b/backend/manager/modules/dal/src/main/java/org/ovirt/engine/core/dao/DiskImageDAO.java
@@ -77,6 +77,4 @@
// TODO mapping methods moved out of DbFacade that will be removed when we
have Hibernate
List<DiskImage> getAllForQuotaId(Guid quotaId);
-
- List<DiskImage> getImagesByStorageIdAndTemplateId(Guid storageId, Guid
templateId);
}
diff --git
a/backend/manager/modules/dal/src/main/java/org/ovirt/engine/core/dao/DiskImageDAODbFacadeImpl.java
b/backend/manager/modules/dal/src/main/java/org/ovirt/engine/core/dao/DiskImageDAODbFacadeImpl.java
index 1e985bf..b8a68b5 100644
---
a/backend/manager/modules/dal/src/main/java/org/ovirt/engine/core/dao/DiskImageDAODbFacadeImpl.java
+++
b/backend/manager/modules/dal/src/main/java/org/ovirt/engine/core/dao/DiskImageDAODbFacadeImpl.java
@@ -104,17 +104,6 @@
}
@Override
- public List<DiskImage> getImagesByStorageIdAndTemplateId(Guid storageId,
Guid templateId) {
- MapSqlParameterSource parameterSource =
getCustomMapSqlParameterSource()
- .addValue("storage_id", storageId)
- .addValue("template_id", templateId);
-
- return
getCallsHandler().executeReadList("GetImageByStorageIdAndTemplateId",
- DiskImageRowMapper.instance,
- parameterSource);
- }
-
- @Override
public List<DiskImage> getImagesWithNoDisk(Guid vmId) {
MapSqlParameterSource parameterSource =
getCustomMapSqlParameterSource()
.addValue("vm_id", vmId);
diff --git
a/backend/manager/modules/dal/src/main/java/org/ovirt/engine/core/dao/DiskImageDAOWrapperImpl.java
b/backend/manager/modules/dal/src/main/java/org/ovirt/engine/core/dao/DiskImageDAOWrapperImpl.java
index 06f681a..763e900 100644
---
a/backend/manager/modules/dal/src/main/java/org/ovirt/engine/core/dao/DiskImageDAOWrapperImpl.java
+++
b/backend/manager/modules/dal/src/main/java/org/ovirt/engine/core/dao/DiskImageDAOWrapperImpl.java
@@ -72,12 +72,6 @@
}
@Override
- public List<DiskImage> getImagesByStorageIdAndTemplateId(Guid storageId,
Guid templateId) {
- // TODO Auto-generated method stub
- return null;
- }
-
- @Override
public List<DiskImage> getImagesWithNoDisk(Guid vmId) {
throw new NotImplementedException();
}
diff --git
a/backend/manager/modules/dal/src/test/java/org/ovirt/engine/core/dao/DiskImageDAOTest.java
b/backend/manager/modules/dal/src/test/java/org/ovirt/engine/core/dao/DiskImageDAOTest.java
index 0e0c5b9..3308d5d 100644
---
a/backend/manager/modules/dal/src/test/java/org/ovirt/engine/core/dao/DiskImageDAOTest.java
+++
b/backend/manager/modules/dal/src/test/java/org/ovirt/engine/core/dao/DiskImageDAOTest.java
@@ -86,26 +86,6 @@
}
@Test
- public void testGetImagesByStorageIdAndTempleteNull() {
- List<DiskImage> result =
-
dao.getImagesByStorageIdAndTemplateId(Guid.createGuidFromString("72e3a666-89e1-4005-a7ca-f7548004a9ab"),
- null);
-
- assertNotNull(result);
- assertFalse(result.isEmpty());
- }
-
- @Test
- public void testGetImagesByStorageIdAndTempleteId() {
- List<DiskImage> result =
-
dao.getImagesByStorageIdAndTemplateId(Guid.createGuidFromString("72e3a666-89e1-4005-a7ca-f7548004a9ab"),
-
Guid.createGuidFromString("1b85420c-b84c-4f29-997e-0eb674b40b79"));
-
- assertNotNull(result);
- assertFalse(result.isEmpty());
- }
-
- @Test
public void testGetAllForQuotaId() {
List<DiskImage> disks =
dao.getAllForQuotaId(FixturesTool.QUOTA_GENERAL);
assertEquals("VM should have five disks", 5, disks.size());
--
To view, visit http://gerrit.ovirt.org/10320
To unsubscribe, visit http://gerrit.ovirt.org/settings
Gerrit-MessageType: newchange
Gerrit-Change-Id: I9e090b64dd8b47a9c79dc8ad6a1c3caab62031b6
Gerrit-PatchSet: 1
Gerrit-Project: ovirt-engine
Gerrit-Branch: master
Gerrit-Owner: Daniel Erez <de...@redhat.com>
_______________________________________________
Engine-patches mailing list
Engine-patches@ovirt.org
http://lists.ovirt.org/mailman/listinfo/engine-patches
