Allon Mureinik has uploaded a new change for review.
Change subject: core: Remove unused GetTagUserMapByTagNameQuery
......................................................................
core: Remove unused GetTagUserMapByTagNameQuery
GetTagUserMapByTagNameQuery not used anywhere in the code.
This patch removes it, its parameter class
(GetTagUserMapByTagNameParameters), 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: I12f3cff1fa6864a85cf8a357aeff39f762c46c90
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/GetTagUserMapByTagNameQuery.java
D
backend/manager/modules/common/src/main/java/org/ovirt/engine/core/common/queries/GetTagUserMapByTagNameParameters.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, 7 insertions(+), 78 deletions(-)
git pull ssh://gerrit.ovirt.org:29418/ovirt-engine refs/changes/97/12597/1
diff --git a/backend/manager/dbscripts/tags_sp.sql
b/backend/manager/dbscripts/tags_sp.sql
index 158f5b2..d5a2007 100644
--- a/backend/manager/dbscripts/tags_sp.sql
+++ b/backend/manager/dbscripts/tags_sp.sql
@@ -275,19 +275,6 @@
-
-Create or replace FUNCTION Gettags_user_mapByTagName(v_tag_name VARCHAR(50))
RETURNS SETOF tags_user_map_view
- AS $procedure$
-BEGIN
- RETURN QUERY SELECT tags_user_map_view.*
- FROM tags_user_map_view
- WHERE tag_name = v_tag_name;
-END; $procedure$
-LANGUAGE plpgsql;
-
-
-
-
Create or replace FUNCTION GetTagsByUserId(v_user_ids VARCHAR(4000)) RETURNS
SETOF tags_user_map_view
AS $procedure$
BEGIN
diff --git
a/backend/manager/modules/bll/src/main/java/org/ovirt/engine/core/bll/GetTagUserMapByTagNameQuery.java
b/backend/manager/modules/bll/src/main/java/org/ovirt/engine/core/bll/GetTagUserMapByTagNameQuery.java
deleted file mode 100644
index 454766c..0000000
---
a/backend/manager/modules/bll/src/main/java/org/ovirt/engine/core/bll/GetTagUserMapByTagNameQuery.java
+++ /dev/null
@@ -1,16 +0,0 @@
-package org.ovirt.engine.core.bll;
-
-import org.ovirt.engine.core.common.queries.GetTagUserMapByTagNameParameters;
-
-// NOT IN USE
-public class GetTagUserMapByTagNameQuery<P extends
GetTagUserMapByTagNameParameters> extends QueriesCommandBase<P> {
- public GetTagUserMapByTagNameQuery(P parameters) {
- super(parameters);
- }
-
- @Override
- protected void executeQueryCommand() {
- getQueryReturnValue()
-
.setReturnValue(getDbFacade().getTagDao().getTagUserMapByTagName(getParameters().getTagName()));
- }
-}
diff --git
a/backend/manager/modules/common/src/main/java/org/ovirt/engine/core/common/queries/GetTagUserMapByTagNameParameters.java
b/backend/manager/modules/common/src/main/java/org/ovirt/engine/core/common/queries/GetTagUserMapByTagNameParameters.java
deleted file mode 100644
index 1c0c2cd..0000000
---
a/backend/manager/modules/common/src/main/java/org/ovirt/engine/core/common/queries/GetTagUserMapByTagNameParameters.java
+++ /dev/null
@@ -1,12 +0,0 @@
-package org.ovirt.engine.core.common.queries;
-
-public class GetTagUserMapByTagNameParameters extends
GetTagByTagNameParametersBase {
- private static final long serialVersionUID = -338757167090549338L;
-
- public GetTagUserMapByTagNameParameters(String tagName) {
- super(tagName);
- }
-
- public GetTagUserMapByTagNameParameters() {
- }
-}
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 70622cc..41bf906 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,
- GetTagUserMapByTagName,
GetTagUserGroupMapByTagName,
GetTagVmMapByTagName,
GetTagVdsMapByTagName,
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 c9d968f..c9fdf74 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
@@ -2,12 +2,12 @@
import java.util.List;
-import org.ovirt.engine.core.common.businessentities.tags;
import org.ovirt.engine.core.common.businessentities.TagsUserGroupMap;
import org.ovirt.engine.core.common.businessentities.TagsUserMap;
import org.ovirt.engine.core.common.businessentities.TagsVdsMap;
import org.ovirt.engine.core.common.businessentities.TagsVmMap;
import org.ovirt.engine.core.common.businessentities.TagsVmPoolMap;
+import org.ovirt.engine.core.common.businessentities.tags;
import org.ovirt.engine.core.compat.Guid;
import org.ovirt.engine.core.compat.NGuid;
@@ -169,8 +169,6 @@
void attachUserToTag(TagsUserMap tagUserMap);
void detachUserFromTag(Guid tagId, Guid userId);
-
- List<TagsUserMap> getTagUserMapByTagName(String tagName);
TagsVdsMap getTagVdsByTagIdAndByVdsId(Guid tagId, Guid vdsId);
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 292e44c..aefb733 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
@@ -314,25 +314,6 @@
.executeModification("Deletetags_user_map", parameterSource);
}
- @SuppressWarnings("unchecked")
- @Override
- public List<TagsUserMap> getTagUserMapByTagName(String tagName) {
- MapSqlParameterSource parameterSource =
getCustomMapSqlParameterSource().addValue("tag_name", tagName);
-
- ParameterizedRowMapper<TagsUserMap> mapper = new
ParameterizedRowMapper<TagsUserMap>() {
- @Override
- public TagsUserMap mapRow(ResultSet rs, int rowNum) throws
SQLException {
- TagsUserMap entity = new TagsUserMap();
-
entity.settag_id(Guid.createGuidFromString(rs.getString("tag_id")));
-
entity.setuser_id(Guid.createGuidFromString(rs.getString("user_id")));
- return entity;
- }
- };
-
- return getCallsHandler()
- .executeReadList("Gettags_user_mapByTagName", mapper,
parameterSource);
- }
-
@Override
public TagsVdsMap getTagVdsByTagIdAndByVdsId(Guid tagId, Guid vdsId) {
MapSqlParameterSource parameterSource =
getCustomMapSqlParameterSource().addValue("tag_id", tagId).addValue(
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 3c213a7..f4a4b26 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
@@ -1,17 +1,20 @@
package org.ovirt.engine.core.dao;
-import static org.junit.Assert.*;
+import static org.junit.Assert.assertEquals;
+import static org.junit.Assert.assertFalse;
+import static org.junit.Assert.assertNotNull;
+import static org.junit.Assert.assertNull;
+import static org.junit.Assert.assertTrue;
import java.util.List;
import org.junit.Before;
import org.junit.Test;
-
-import org.ovirt.engine.core.common.businessentities.tags;
import org.ovirt.engine.core.common.businessentities.TagsUserGroupMap;
import org.ovirt.engine.core.common.businessentities.TagsUserMap;
import org.ovirt.engine.core.common.businessentities.TagsVdsMap;
import org.ovirt.engine.core.common.businessentities.TagsVmMap;
+import org.ovirt.engine.core.common.businessentities.tags;
import org.ovirt.engine.core.compat.Guid;
/**
@@ -386,17 +389,6 @@
assertEquals("Tag ID is not equal",existing.gettag_id(),
result.gettag_id());
assertEquals("USER ID is not equal",existing.getuser_id(),
result.getuser_id());
assertEquals("Object equation",existing,result);
- }
-
- @Test
- public void testGetTagUserMapByTagName() {
- List<TagsUserMap> result =
dao.getTagUserMapByTagName(existingTag.gettag_name());
-
- assertNotNull(result);
- assertFalse(result.isEmpty());
- for (TagsUserMap mapping : result) {
- assertEquals(existingTag.gettag_id(), mapping.gettag_id());
- }
}
@Test
--
To view, visit http://gerrit.ovirt.org/12597
To unsubscribe, visit http://gerrit.ovirt.org/settings
Gerrit-MessageType: newchange
Gerrit-Change-Id: I12f3cff1fa6864a85cf8a357aeff39f762c46c90
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
