Sharad Mishra has uploaded a new change for review.
Change subject: core: Renamed tags_user_group_map.java to TagsUserGroupMap.java
......................................................................
core: Renamed tags_user_group_map.java to TagsUserGroupMap.java
Change-Id: I2313b7ff9c42543e6cb83f2074c95e0d1fa1a8a2
Signed-off-by: Sharad Mishra <snmis...@linux.vnet.ibm.com>
---
M
backend/manager/modules/bll/src/main/java/org/ovirt/engine/core/bll/AttachUserGroupToTagCommand.java
R
backend/manager/modules/common/src/main/java/org/ovirt/engine/core/common/businessentities/TagsUserGroupMap.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/main/java/org/ovirt/engine/core/dao/TagDAOHibernateImpl.java
M
backend/manager/modules/dal/src/main/java/org/ovirt/engine/core/dao/tags/TagUserGroupMapDAO.java
M
backend/manager/modules/dal/src/test/java/org/ovirt/engine/core/dao/BaseDAOTestCase.java
M
backend/manager/modules/dal/src/test/java/org/ovirt/engine/core/dao/TagDAOTest.java
8 files changed, 36 insertions(+), 36 deletions(-)
git pull ssh://gerrit.ovirt.org:29418/ovirt-engine refs/changes/77/10077/1
diff --git
a/backend/manager/modules/bll/src/main/java/org/ovirt/engine/core/bll/AttachUserGroupToTagCommand.java
b/backend/manager/modules/bll/src/main/java/org/ovirt/engine/core/bll/AttachUserGroupToTagCommand.java
index 78fb396..3ee643d 100644
---
a/backend/manager/modules/bll/src/main/java/org/ovirt/engine/core/bll/AttachUserGroupToTagCommand.java
+++
b/backend/manager/modules/bll/src/main/java/org/ovirt/engine/core/bll/AttachUserGroupToTagCommand.java
@@ -3,7 +3,7 @@
import org.ovirt.engine.core.common.AuditLogType;
import org.ovirt.engine.core.common.action.AttachEntityToTagParameters;
import org.ovirt.engine.core.common.businessentities.ad_groups;
-import org.ovirt.engine.core.common.businessentities.tags_user_group_map;
+import org.ovirt.engine.core.common.businessentities.TagsUserGroupMap;
import org.ovirt.engine.core.compat.Guid;
import org.ovirt.engine.core.dal.dbbroker.DbFacade;
@@ -19,7 +19,7 @@
for (Guid groupGuid : getGroupList()) {
ad_groups group =
DbFacade.getInstance().getAdGroupDao().get(groupGuid);
if
(DbFacade.getInstance().getTagDao().getTagUserGroupByGroupIdAndByTagId(getTagId(),
groupGuid) == null) {
- tags_user_group_map map = new
tags_user_group_map(groupGuid, getTagId());
+ TagsUserGroupMap map = new TagsUserGroupMap(groupGuid,
getTagId());
DbFacade.getInstance().getTagDao().attachUserGroupToTag(map);
noActionDone = false;
if (group != null) {
diff --git
a/backend/manager/modules/common/src/main/java/org/ovirt/engine/core/common/businessentities/tags_user_group_map.java
b/backend/manager/modules/common/src/main/java/org/ovirt/engine/core/common/businessentities/TagsUserGroupMap.java
similarity index 91%
rename from
backend/manager/modules/common/src/main/java/org/ovirt/engine/core/common/businessentities/tags_user_group_map.java
rename to
backend/manager/modules/common/src/main/java/org/ovirt/engine/core/common/businessentities/TagsUserGroupMap.java
index 6097955..1eddf6b 100644
---
a/backend/manager/modules/common/src/main/java/org/ovirt/engine/core/common/businessentities/tags_user_group_map.java
+++
b/backend/manager/modules/common/src/main/java/org/ovirt/engine/core/common/businessentities/TagsUserGroupMap.java
@@ -23,7 +23,7 @@
@NamedQueries({ @NamedQuery(
name = "get_all_tags_user_group_maps_for_tag_name",
query = "select m from tags_user_group_map m, tags t where (m.tagId =
t.id) and (t.name = :tag_name)") })
-public class tags_user_group_map implements Serializable {
+public class TagsUserGroupMap implements Serializable {
private static final long serialVersionUID = -731433436876337432L;
@Id
@@ -38,10 +38,10 @@
@Column(name = "_create_date")
private Date created = new Date();
- public tags_user_group_map() {
+ public TagsUserGroupMap() {
}
- public tags_user_group_map(Guid group_id, Guid tag_id) {
+ public TagsUserGroupMap(Guid group_id, Guid tag_id) {
this.groupId = group_id;
this.tagId = tag_id;
}
@@ -79,7 +79,7 @@
return false;
if (getClass() != obj.getClass())
return false;
- tags_user_group_map other = (tags_user_group_map) obj;
+ TagsUserGroupMap other = (TagsUserGroupMap) obj;
if (groupId == null) {
if (other.groupId != null)
return false;
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 149249b..823b41b 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
@@ -3,7 +3,7 @@
import java.util.List;
import org.ovirt.engine.core.common.businessentities.tags;
-import org.ovirt.engine.core.common.businessentities.tags_user_group_map;
+import org.ovirt.engine.core.common.businessentities.TagsUserGroupMap;
import org.ovirt.engine.core.common.businessentities.tags_user_map;
import org.ovirt.engine.core.common.businessentities.tags_vds_map;
import org.ovirt.engine.core.common.businessentities.tags_vm_map;
@@ -158,13 +158,13 @@
// TODO these APIs will be eliminated when we move to hibernate
- void attachUserGroupToTag(tags_user_group_map map);
+ void attachUserGroupToTag(TagsUserGroupMap map);
- tags_user_group_map getTagUserGroupByGroupIdAndByTagId(Guid tagId, Guid
groupId);
+ TagsUserGroupMap getTagUserGroupByGroupIdAndByTagId(Guid tagId, Guid
groupId);
void detachUserGroupFromTag(Guid tagId, Guid groupId);
- List<tags_user_group_map> getTagUserGroupMapsForTagName(String tagName);
+ List<TagsUserGroupMap> getTagUserGroupMapsForTagName(String tagName);
tags_user_map getTagUserByTagIdAndByuserId(Guid tagId, Guid userId);
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 17f0fb9..c685af6 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
@@ -6,7 +6,7 @@
import org.ovirt.engine.core.common.businessentities.TagsType;
import org.ovirt.engine.core.common.businessentities.tags;
-import org.ovirt.engine.core.common.businessentities.tags_user_group_map;
+import org.ovirt.engine.core.common.businessentities.TagsUserGroupMap;
import org.ovirt.engine.core.common.businessentities.tags_user_map;
import org.ovirt.engine.core.common.businessentities.tags_vds_map;
import org.ovirt.engine.core.common.businessentities.tags_vm_map;
@@ -222,14 +222,14 @@
}
@Override
- public tags_user_group_map getTagUserGroupByGroupIdAndByTagId(Guid tag,
Guid group) {
+ public TagsUserGroupMap getTagUserGroupByGroupIdAndByTagId(Guid tag, Guid
group) {
MapSqlParameterSource parameterSource =
getCustomMapSqlParameterSource().addValue("group_id", group)
.addValue("tag_id", tag);
- ParameterizedRowMapper<tags_user_group_map> mapper = new
ParameterizedRowMapper<tags_user_group_map>() {
+ ParameterizedRowMapper<TagsUserGroupMap> mapper = new
ParameterizedRowMapper<TagsUserGroupMap>() {
@Override
- public tags_user_group_map mapRow(ResultSet rs, int rowNum) throws
SQLException {
- tags_user_group_map entity = new tags_user_group_map();
+ 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;
@@ -241,7 +241,7 @@
}
@Override
- public void attachUserGroupToTag(tags_user_group_map tagUserGroupMap) {
+ public void attachUserGroupToTag(TagsUserGroupMap tagUserGroupMap) {
MapSqlParameterSource parameterSource =
getCustomMapSqlParameterSource().addValue("group_id",
tagUserGroupMap.getgroup_id()).addValue("tag_id",
tagUserGroupMap.gettag_id());
@@ -260,13 +260,13 @@
@SuppressWarnings("unchecked")
@Override
- public List<tags_user_group_map> getTagUserGroupMapsForTagName(String
tagName) {
+ public List<TagsUserGroupMap> getTagUserGroupMapsForTagName(String
tagName) {
MapSqlParameterSource parameterSource =
getCustomMapSqlParameterSource().addValue("tag_name", tagName);
- ParameterizedRowMapper<tags_user_group_map> mapper = new
ParameterizedRowMapper<tags_user_group_map>() {
+ ParameterizedRowMapper<TagsUserGroupMap> mapper = new
ParameterizedRowMapper<TagsUserGroupMap>() {
@Override
- public tags_user_group_map mapRow(ResultSet rs, int rowNum) throws
SQLException {
- tags_user_group_map entity = new tags_user_group_map();
+ 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;
diff --git
a/backend/manager/modules/dal/src/main/java/org/ovirt/engine/core/dao/TagDAOHibernateImpl.java
b/backend/manager/modules/dal/src/main/java/org/ovirt/engine/core/dao/TagDAOHibernateImpl.java
index 6eba997..e540dbd 100644
---
a/backend/manager/modules/dal/src/main/java/org/ovirt/engine/core/dao/TagDAOHibernateImpl.java
+++
b/backend/manager/modules/dal/src/main/java/org/ovirt/engine/core/dao/TagDAOHibernateImpl.java
@@ -9,7 +9,7 @@
import org.ovirt.engine.core.common.businessentities.TagsType;
import org.ovirt.engine.core.common.businessentities.tags;
-import org.ovirt.engine.core.common.businessentities.tags_user_group_map;
+import org.ovirt.engine.core.common.businessentities.TagsUserGroupMap;
import org.ovirt.engine.core.common.businessentities.tags_user_map;
import org.ovirt.engine.core.common.businessentities.tags_vds_map;
import org.ovirt.engine.core.common.businessentities.tags_vds_map_id;
@@ -118,7 +118,7 @@
}
@Override
- public tags_user_group_map getTagUserGroupByGroupIdAndByTagId(Guid tagId,
Guid groupId) {
+ public TagsUserGroupMap getTagUserGroupByGroupIdAndByTagId(Guid tagId,
Guid groupId) {
return tagUserGroupMapDAO.findOneByCriteria(Restrictions.eq("tagId",
tagId),
Restrictions.eq("groupId", groupId));
}
@@ -130,7 +130,7 @@
@SuppressWarnings("unchecked")
@Override
- public List<tags_user_group_map> getTagUserGroupMapsForTagName(String
tagName) {
+ public List<TagsUserGroupMap> getTagUserGroupMapsForTagName(String
tagName) {
Session session = getSession();
Query query =
session.getNamedQuery("get_all_tags_user_group_maps_for_tag_name");
@@ -145,7 +145,7 @@
}
@Override
- public void attachUserGroupToTag(tags_user_group_map map) {
+ public void attachUserGroupToTag(TagsUserGroupMap map) {
tagUserGroupMapDAO.save(map);
}
diff --git
a/backend/manager/modules/dal/src/main/java/org/ovirt/engine/core/dao/tags/TagUserGroupMapDAO.java
b/backend/manager/modules/dal/src/main/java/org/ovirt/engine/core/dao/tags/TagUserGroupMapDAO.java
index f7cf769..6fa965a 100644
---
a/backend/manager/modules/dal/src/main/java/org/ovirt/engine/core/dao/tags/TagUserGroupMapDAO.java
+++
b/backend/manager/modules/dal/src/main/java/org/ovirt/engine/core/dao/tags/TagUserGroupMapDAO.java
@@ -3,13 +3,13 @@
import org.hibernate.Query;
import org.hibernate.Session;
-import org.ovirt.engine.core.common.businessentities.tags_user_group_map;
+import org.ovirt.engine.core.common.businessentities.TagsUserGroupMap;
import org.ovirt.engine.core.compat.Guid;
import org.ovirt.engine.core.dao.BaseDAOHibernateImpl;
-public class TagUserGroupMapDAO extends
BaseDAOHibernateImpl<tags_user_group_map, Guid> {
+public class TagUserGroupMapDAO extends BaseDAOHibernateImpl<TagsUserGroupMap,
Guid> {
public TagUserGroupMapDAO() {
- super(tags_user_group_map.class);
+ super(TagsUserGroupMap.class);
}
public void remove(Guid tagId, Guid groupId) {
diff --git
a/backend/manager/modules/dal/src/test/java/org/ovirt/engine/core/dao/BaseDAOTestCase.java
b/backend/manager/modules/dal/src/test/java/org/ovirt/engine/core/dao/BaseDAOTestCase.java
index 53e22ee..56fb865 100644
---
a/backend/manager/modules/dal/src/test/java/org/ovirt/engine/core/dao/BaseDAOTestCase.java
+++
b/backend/manager/modules/dal/src/test/java/org/ovirt/engine/core/dao/BaseDAOTestCase.java
@@ -53,7 +53,7 @@
import org.ovirt.engine.core.common.businessentities.storage_pool_iso_map;
import
org.ovirt.engine.core.common.businessentities.storage_server_connections;
import org.ovirt.engine.core.common.businessentities.tags;
-import org.ovirt.engine.core.common.businessentities.tags_user_group_map;
+import org.ovirt.engine.core.common.businessentities.TagsUserGroupMap;
import org.ovirt.engine.core.common.businessentities.tags_user_map;
import org.ovirt.engine.core.common.businessentities.tags_vds_map;
import org.ovirt.engine.core.common.businessentities.tags_vm_map;
@@ -223,7 +223,7 @@
.addAnnotatedClass(storage_pool_iso_map.class)
.addAnnotatedClass(storage_server_connections.class)
.addAnnotatedClass(tags.class)
- .addAnnotatedClass(tags_user_group_map.class)
+ .addAnnotatedClass(TagsUserGroupMap.class)
.addAnnotatedClass(tags_user_map.class)
.addAnnotatedClass(tags_vds_map.class)
.addAnnotatedClass(tags_vm_map.class)
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 f068370..c099f62 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
@@ -8,7 +8,7 @@
import org.junit.Test;
import org.ovirt.engine.core.common.businessentities.tags;
-import org.ovirt.engine.core.common.businessentities.tags_user_group_map;
+import org.ovirt.engine.core.common.businessentities.TagsUserGroupMap;
import org.ovirt.engine.core.common.businessentities.tags_user_map;
import org.ovirt.engine.core.common.businessentities.tags_vds_map;
import org.ovirt.engine.core.common.businessentities.tags_vm_map;
@@ -34,7 +34,7 @@
private Guid parent;
private Guid user;
private Guid vm;
- private tags_user_group_map existingUserGroupTag;
+ private TagsUserGroupMap existingUserGroupTag;
private tags_user_map existingUserTag;
private tags_vds_map existingVdsTag;
private tags_vds_map newVdsTag;
@@ -337,7 +337,7 @@
@Test
public void testGetTagUserGroupByGroupIdAndTagId() {
- tags_user_group_map result =
dao.getTagUserGroupByGroupIdAndByTagId(existingUserGroupTag.gettag_id(),
+ TagsUserGroupMap result =
dao.getTagUserGroupByGroupIdAndByTagId(existingUserGroupTag.gettag_id(),
existingUserGroupTag.getgroup_id());
assertNotNull(result);
@@ -345,7 +345,7 @@
}
- private void assertEqualsTagUserGroupMap(tags_user_group_map existing,
tags_user_group_map result) {
+ private void assertEqualsTagUserGroupMap(TagsUserGroupMap existing,
TagsUserGroupMap result) {
assertEquals("Group IDs not equal",existing.getgroup_id(),
result.getgroup_id());
assertEquals("Tag IDs not equal",existing.gettag_id(),
result.gettag_id());
assertEquals("Object equation",existing,result);
@@ -356,7 +356,7 @@
public void testDetachUserGroupFromTag() {
dao.detachUserGroupFromTag(existingUserGroupTag.gettag_id(),
existingUserGroupTag.getgroup_id());
- tags_user_group_map result =
dao.getTagUserGroupByGroupIdAndByTagId(existingUserGroupTag.gettag_id(),
+ TagsUserGroupMap result =
dao.getTagUserGroupByGroupIdAndByTagId(existingUserGroupTag.gettag_id(),
existingUserGroupTag.getgroup_id());
assertNull(result);
@@ -364,11 +364,11 @@
@Test
public void testGetAllUserGroupMapsForTagName() {
- List<tags_user_group_map> result =
dao.getTagUserGroupMapsForTagName(existingTag.gettag_name());
+ List<TagsUserGroupMap> result =
dao.getTagUserGroupMapsForTagName(existingTag.gettag_name());
assertNotNull(result);
assertFalse(result.isEmpty());
- for (tags_user_group_map mapping : result) {
+ for (TagsUserGroupMap mapping : result) {
assertEquals(existingTag.gettag_id(), mapping.gettag_id());
}
}
--
To view, visit http://gerrit.ovirt.org/10077
To unsubscribe, visit http://gerrit.ovirt.org/settings
Gerrit-MessageType: newchange
Gerrit-Change-Id: I2313b7ff9c42543e6cb83f2074c95e0d1fa1a8a2
Gerrit-PatchSet: 1
Gerrit-Project: ovirt-engine
Gerrit-Branch: master
Gerrit-Owner: Sharad Mishra <snmis...@linux.vnet.ibm.com>
_______________________________________________
Engine-patches mailing list
Engine-patches@ovirt.org
http://lists.ovirt.org/mailman/listinfo/engine-patches
