Allon Mureinik has uploaded a new change for review.
Change subject: core: Remove GetTagVmMapByTagNameQuery
......................................................................
core: Remove GetTagVmMapByTagNameQuery
GetTagVmMapByTagNameQuery not used anywhere in the code.
This patch removes it, its parameter class
(GetTagVmByTagNameParameters), the corresponding
VdcQueryType constant, the DAO method only it used to use, the
corresponding test for the DAO and the corresponding stored procedure.
Change-Id: I6c502ffbc5381cb08dd64e8702330baf0371fd25
Signed-off-by: Allon Mureinik <amure...@redhat.com>
---
M backend/manager/dbscripts/tags_sp.sql
D
backend/manager/modules/bll/src/main/java/org/ovirt/engine/core/bll/GetTagVmMapByTagNameQuery.java
D
backend/manager/modules/common/src/main/java/org/ovirt/engine/core/common/queries/GetTagVmMapByTagNameParameters.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/TagDAO.java
M
backend/manager/modules/dal/src/main/java/org/ovirt/engine/core/dao/TagDAODbFacadeImpl.java
M
backend/manager/modules/dal/src/test/java/org/ovirt/engine/core/dao/TagDAOTest.java
7 files changed, 0 insertions(+), 74 deletions(-)
git pull ssh://gerrit.ovirt.org:29418/ovirt-engine refs/changes/99/12599/1
diff --git a/backend/manager/dbscripts/tags_sp.sql
b/backend/manager/dbscripts/tags_sp.sql
index 2c94e10..cb546ae 100644
--- a/backend/manager/dbscripts/tags_sp.sql
+++ b/backend/manager/dbscripts/tags_sp.sql
@@ -440,19 +440,6 @@
-Create or replace FUNCTION Gettags_vm_mapByTagName(v_tag_name VARCHAR(50))
RETURNS SETOF tags_vm_map_view
- AS $procedure$
-BEGIN
- RETURN QUERY SELECT tags_vm_map_view.*
- FROM tags_vm_map_view
- WHERE tag_name = v_tag_name;
-END; $procedure$
-LANGUAGE plpgsql;
-
-
-
-
-
Create or replace FUNCTION GetTagsByVmId(v_vm_ids VARCHAR(4000)) RETURNS SETOF
tags_vm_map_view
AS $procedure$
BEGIN
diff --git
a/backend/manager/modules/bll/src/main/java/org/ovirt/engine/core/bll/GetTagVmMapByTagNameQuery.java
b/backend/manager/modules/bll/src/main/java/org/ovirt/engine/core/bll/GetTagVmMapByTagNameQuery.java
deleted file mode 100644
index c463e4e..0000000
---
a/backend/manager/modules/bll/src/main/java/org/ovirt/engine/core/bll/GetTagVmMapByTagNameQuery.java
+++ /dev/null
@@ -1,16 +0,0 @@
-package org.ovirt.engine.core.bll;
-
-import org.ovirt.engine.core.common.queries.GetTagVmMapByTagNameParameters;
-import org.ovirt.engine.core.dal.dbbroker.DbFacade;
-
-// NOT IN USE
-public class GetTagVmMapByTagNameQuery<P extends
GetTagVmMapByTagNameParameters> extends QueriesCommandBase<P> {
- public GetTagVmMapByTagNameQuery(P parameters) {
- super(parameters);
- }
-
- @Override
- protected void executeQueryCommand() {
-
getQueryReturnValue().setReturnValue(DbFacade.getInstance().getTagDao().getTagVmMapByTagName(getParameters().getTagName()));
- }
-}
diff --git
a/backend/manager/modules/common/src/main/java/org/ovirt/engine/core/common/queries/GetTagVmMapByTagNameParameters.java
b/backend/manager/modules/common/src/main/java/org/ovirt/engine/core/common/queries/GetTagVmMapByTagNameParameters.java
deleted file mode 100644
index f597ca3..0000000
---
a/backend/manager/modules/common/src/main/java/org/ovirt/engine/core/common/queries/GetTagVmMapByTagNameParameters.java
+++ /dev/null
@@ -1,12 +0,0 @@
-package org.ovirt.engine.core.common.queries;
-
-public class GetTagVmMapByTagNameParameters extends
GetTagByTagNameParametersBase {
- private static final long serialVersionUID = -3851616645160264609L;
-
- public GetTagVmMapByTagNameParameters(String tagName) {
- super(tagName);
- }
-
- public GetTagVmMapByTagNameParameters() {
- }
-}
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 d367910..3fc282a 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
@@ -135,7 +135,6 @@
GetTagsByUserId,
GetTagsByVmId,
GetTagsByVdsId,
- GetTagVmMapByTagName,
GetTagVdsMapByTagName,
GetTagIdsAndChildrenIdsByRegExp,
GetTagIdAndChildrenIds,
diff --git
a/backend/manager/modules/dal/src/main/java/org/ovirt/engine/core/dao/TagDAO.java
b/backend/manager/modules/dal/src/main/java/org/ovirt/engine/core/dao/TagDAO.java
index 8fc933e..d9224e9 100644
---
a/backend/manager/modules/dal/src/main/java/org/ovirt/engine/core/dao/TagDAO.java
+++
b/backend/manager/modules/dal/src/main/java/org/ovirt/engine/core/dao/TagDAO.java
@@ -184,8 +184,6 @@
void detachVmFromTag(Guid tagId, Guid vmId);
- List<TagsVmMap> getTagVmMapByTagName(String tagName);
-
List<TagsVmMap> getTagVmMapByVmIdAndDefaultTag(Guid vmid);
List<TagsVmMap> getTimeLeasedUserVmsByAdGroupAndVmPoolId(Guid adGroupId,
Guid vmPoolId);
diff --git
a/backend/manager/modules/dal/src/main/java/org/ovirt/engine/core/dao/TagDAODbFacadeImpl.java
b/backend/manager/modules/dal/src/main/java/org/ovirt/engine/core/dao/TagDAODbFacadeImpl.java
index c868ea8..d2515f4 100644
---
a/backend/manager/modules/dal/src/main/java/org/ovirt/engine/core/dao/TagDAODbFacadeImpl.java
+++
b/backend/manager/modules/dal/src/main/java/org/ovirt/engine/core/dao/TagDAODbFacadeImpl.java
@@ -402,25 +402,6 @@
@SuppressWarnings("unchecked")
@Override
- public List<TagsVmMap> getTagVmMapByTagName(String tagName) {
- MapSqlParameterSource parameterSource =
getCustomMapSqlParameterSource().addValue("tag_name", tagName);
-
- ParameterizedRowMapper<TagsVmMap> mapper = new
ParameterizedRowMapper<TagsVmMap>() {
- @Override
- public TagsVmMap mapRow(ResultSet rs, int rowNum) throws
SQLException {
- TagsVmMap entity = new TagsVmMap();
-
entity.settag_id(Guid.createGuidFromString(rs.getString("tag_id")));
-
entity.setvm_id(Guid.createGuidFromString(rs.getString("vm_id")));
- return entity;
- }
- };
-
- return getCallsHandler()
- .executeReadList("Gettags_vm_mapByTagName", mapper,
parameterSource);
- }
-
- @SuppressWarnings("unchecked")
- @Override
public List<TagsVmMap> getTagVmMapByVmIdAndDefaultTag(Guid vmid) {
MapSqlParameterSource parameterSource =
getCustomMapSqlParameterSource().addValue("vm_id", vmid);
diff --git
a/backend/manager/modules/dal/src/test/java/org/ovirt/engine/core/dao/TagDAOTest.java
b/backend/manager/modules/dal/src/test/java/org/ovirt/engine/core/dao/TagDAOTest.java
index 0bd9091..e041a14 100644
---
a/backend/manager/modules/dal/src/test/java/org/ovirt/engine/core/dao/TagDAOTest.java
+++
b/backend/manager/modules/dal/src/test/java/org/ovirt/engine/core/dao/TagDAOTest.java
@@ -470,17 +470,6 @@
}
@Test
- public void testGetTagVmMapByTagName() {
- List<TagsVmMap> result =
dao.getTagVmMapByTagName(existingTag.gettag_name());
-
- assertNotNull(result);
- assertFalse(result.isEmpty());
- for (TagsVmMap mapping : result) {
- assertEquals(existingTag.gettag_id(), mapping.gettag_id());
- }
- }
-
- @Test
public void testGetTagVmMapByByVmIdAndDefaultTag() {
List<TagsVmMap> result =
dao.getTagVmMapByVmIdAndDefaultTag(EXISTING_VM_ID);
--
To view, visit http://gerrit.ovirt.org/12599
To unsubscribe, visit http://gerrit.ovirt.org/settings
Gerrit-MessageType: newchange
Gerrit-Change-Id: I6c502ffbc5381cb08dd64e8702330baf0371fd25
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
