Allon Mureinik has uploaded a new change for review.
Change subject: core: Remove GetTagUserGroupMapByTagNameQuery
......................................................................
core: Remove GetTagUserGroupMapByTagNameQuery
GetTagUserGroupMapByTagNameQuery not used anywhere in the code.
This patch removes it, its parameter class
(GetTagUserGroupMapByTagNameParameters), 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: Ia30bcc3a9bdf1df87074497819e8750b8929f1be
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/GetTagUserGroupMapByTagNameQuery.java
D
backend/manager/modules/common/src/main/java/org/ovirt/engine/core/common/queries/GetTagUserGroupMapByTagNameParameters.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(+), 75 deletions(-)
git pull ssh://gerrit.ovirt.org:29418/ovirt-engine refs/changes/98/12598/1
diff --git a/backend/manager/dbscripts/tags_sp.sql
b/backend/manager/dbscripts/tags_sp.sql
index d5a2007..2c94e10 100644
--- a/backend/manager/dbscripts/tags_sp.sql
+++ b/backend/manager/dbscripts/tags_sp.sql
@@ -182,18 +182,6 @@
-Create or replace FUNCTION Gettags_user_group_mapByTagName(v_tag_name
VARCHAR(50)) RETURNS SETOF tags_user_group_map_view
- AS $procedure$
-BEGIN
- RETURN QUERY SELECT tags_user_group_map_view.*
- FROM tags_user_group_map_view
- WHERE tag_name = v_tag_name;
-END; $procedure$
-LANGUAGE plpgsql;
-
-
-
-
Create or replace FUNCTION GetTagsByUserGroupId(v_group_ids VARCHAR(4000))
RETURNS SETOF tags_user_group_map_view
AS $procedure$
BEGIN
diff --git
a/backend/manager/modules/bll/src/main/java/org/ovirt/engine/core/bll/GetTagUserGroupMapByTagNameQuery.java
b/backend/manager/modules/bll/src/main/java/org/ovirt/engine/core/bll/GetTagUserGroupMapByTagNameQuery.java
deleted file mode 100644
index 06c9f5d..0000000
---
a/backend/manager/modules/bll/src/main/java/org/ovirt/engine/core/bll/GetTagUserGroupMapByTagNameQuery.java
+++ /dev/null
@@ -1,18 +0,0 @@
-package org.ovirt.engine.core.bll;
-
-import
org.ovirt.engine.core.common.queries.GetTagUserGroupMapByTagNameParameters;
-import org.ovirt.engine.core.dal.dbbroker.DbFacade;
-
-// NOT IN USE
-public class GetTagUserGroupMapByTagNameQuery<P extends
GetTagUserGroupMapByTagNameParameters>
- extends QueriesCommandBase<P> {
- public GetTagUserGroupMapByTagNameQuery(P parameters) {
- super(parameters);
- }
-
- @Override
- protected void executeQueryCommand() {
- getQueryReturnValue()
-
.setReturnValue(DbFacade.getInstance().getTagDao().getTagUserGroupMapsForTagName(getParameters().getTagName()));
- }
-}
diff --git
a/backend/manager/modules/common/src/main/java/org/ovirt/engine/core/common/queries/GetTagUserGroupMapByTagNameParameters.java
b/backend/manager/modules/common/src/main/java/org/ovirt/engine/core/common/queries/GetTagUserGroupMapByTagNameParameters.java
deleted file mode 100644
index 479b5eb..0000000
---
a/backend/manager/modules/common/src/main/java/org/ovirt/engine/core/common/queries/GetTagUserGroupMapByTagNameParameters.java
+++ /dev/null
@@ -1,12 +0,0 @@
-package org.ovirt.engine.core.common.queries;
-
-public class GetTagUserGroupMapByTagNameParameters extends
GetTagByTagNameParametersBase {
- private static final long serialVersionUID = -4848218011737609408L;
-
- public GetTagUserGroupMapByTagNameParameters(String tagName) {
- super(tagName);
- }
-
- public GetTagUserGroupMapByTagNameParameters() {
- }
-}
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 41bf906..d367910 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,
- GetTagUserGroupMapByTagName,
GetTagVmMapByTagName,
GetTagVdsMapByTagName,
GetTagIdsAndChildrenIdsByRegExp,
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 c9fdf74..8fc933e 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
@@ -162,8 +162,6 @@
void detachUserGroupFromTag(Guid tagId, Guid groupId);
- List<TagsUserGroupMap> getTagUserGroupMapsForTagName(String tagName);
-
TagsUserMap getTagUserByTagIdAndByuserId(Guid tagId, Guid userId);
void attachUserToTag(TagsUserMap tagUserMap);
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 aefb733..c868ea8 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
@@ -258,25 +258,6 @@
.executeModification("Deletetags_user_group_map",
parameterSource);
}
- @SuppressWarnings("unchecked")
- @Override
- public List<TagsUserGroupMap> getTagUserGroupMapsForTagName(String
tagName) {
- MapSqlParameterSource parameterSource =
getCustomMapSqlParameterSource().addValue("tag_name", tagName);
-
- ParameterizedRowMapper<TagsUserGroupMap> mapper = new
ParameterizedRowMapper<TagsUserGroupMap>() {
- @Override
- public TagsUserGroupMap mapRow(ResultSet rs, int rowNum) throws
SQLException {
- TagsUserGroupMap entity = new TagsUserGroupMap();
-
entity.setgroup_id(Guid.createGuidFromString(rs.getString("group_id")));
-
entity.settag_id(Guid.createGuidFromString(rs.getString("tag_id")));
- return entity;
- }
- };
-
- return getCallsHandler()
- .executeReadList("Gettags_user_group_mapByTagName",
mapper, parameterSource);
- }
-
@Override
public TagsUserMap getTagUserByTagIdAndByuserId(Guid tagId, Guid userId) {
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 f4a4b26..0bd9091 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
@@ -366,17 +366,6 @@
}
@Test
- public void testGetAllUserGroupMapsForTagName() {
- List<TagsUserGroupMap> result =
dao.getTagUserGroupMapsForTagName(existingTag.gettag_name());
-
- assertNotNull(result);
- assertFalse(result.isEmpty());
- for (TagsUserGroupMap mapping : result) {
- assertEquals(existingTag.gettag_id(), mapping.gettag_id());
- }
- }
-
- @Test
public void testGetUserTag() {
TagsUserMap result =
dao.getTagUserByTagIdAndByuserId(existingUserTag.gettag_id(),
existingUserTag.getuser_id());
--
To view, visit http://gerrit.ovirt.org/12598
To unsubscribe, visit http://gerrit.ovirt.org/settings
Gerrit-MessageType: newchange
Gerrit-Change-Id: Ia30bcc3a9bdf1df87074497819e8750b8929f1be
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
