Sharad Mishra has uploaded a new change for review.
Change subject: core: Renamed tags_user_map.java to TagsUserMap.java
......................................................................
core: Renamed tags_user_map.java to TagsUserMap.java
Change-Id: I64dafb5d61f94d1fc3916a612ff314fbbd550935
Signed-off-by: Sharad Mishra <snmis...@linux.vnet.ibm.com>
---
M
backend/manager/modules/bll/src/main/java/org/ovirt/engine/core/bll/AttachUserToTagCommand.java
R
backend/manager/modules/common/src/main/java/org/ovirt/engine/core/common/businessentities/TagsUserMap.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/TagUserMapDAO.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, 37 insertions(+), 37 deletions(-)
git pull ssh://gerrit.ovirt.org:29418/ovirt-engine refs/changes/79/10079/1
diff --git
a/backend/manager/modules/bll/src/main/java/org/ovirt/engine/core/bll/AttachUserToTagCommand.java
b/backend/manager/modules/bll/src/main/java/org/ovirt/engine/core/bll/AttachUserToTagCommand.java
index 30403f3..1ab7a8d 100644
---
a/backend/manager/modules/bll/src/main/java/org/ovirt/engine/core/bll/AttachUserToTagCommand.java
+++
b/backend/manager/modules/bll/src/main/java/org/ovirt/engine/core/bll/AttachUserToTagCommand.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.DbUser;
-import org.ovirt.engine.core.common.businessentities.tags_user_map;
+import org.ovirt.engine.core.common.businessentities.TagsUserMap;
import org.ovirt.engine.core.compat.Guid;
import org.ovirt.engine.core.dal.dbbroker.DbFacade;
@@ -14,12 +14,12 @@
@Override
protected void executeCommand() {
- tags_user_map map;
+ TagsUserMap map;
if (getTagId() != null) {
for (Guid userGuid : getUserList()) {
DbUser user =
DbFacade.getInstance().getDbUserDao().get(userGuid);
if
(DbFacade.getInstance().getTagDao().getTagUserByTagIdAndByuserId(getTagId(),
userGuid) == null) {
- map = new tags_user_map(getTagId(), userGuid);
+ map = new TagsUserMap(getTagId(), userGuid);
DbFacade.getInstance().getTagDao().attachUserToTag(map);
noActionDone = false;
if (user != null) {
diff --git
a/backend/manager/modules/common/src/main/java/org/ovirt/engine/core/common/businessentities/tags_user_map.java
b/backend/manager/modules/common/src/main/java/org/ovirt/engine/core/common/businessentities/TagsUserMap.java
similarity index 92%
rename from
backend/manager/modules/common/src/main/java/org/ovirt/engine/core/common/businessentities/tags_user_map.java
rename to
backend/manager/modules/common/src/main/java/org/ovirt/engine/core/common/businessentities/TagsUserMap.java
index 8d6292f..57991f8 100644
---
a/backend/manager/modules/common/src/main/java/org/ovirt/engine/core/common/businessentities/tags_user_map.java
+++
b/backend/manager/modules/common/src/main/java/org/ovirt/engine/core/common/businessentities/TagsUserMap.java
@@ -22,7 +22,7 @@
@TypeDef(name = "guid", typeClass = GuidType.class)
@NamedQueries({ @NamedQuery(name = "all_tag_user_maps_by_tag_name",
query = "select m from tags_user_map m, tags t where (m.tagId = t.id)
and (t.name = :tag_name)") })
-public class tags_user_map implements Serializable {
+public class TagsUserMap implements Serializable {
private static final long serialVersionUID = 8616194965200914499L;
@Id
@@ -37,10 +37,10 @@
@Column(name = "_create_date")
private Date created = new Date();
- public tags_user_map() {
+ public TagsUserMap() {
}
- public tags_user_map(Guid tag_id, Guid user_id) {
+ public TagsUserMap(Guid tag_id, Guid user_id) {
this.tagId = tag_id;
this.userId = user_id;
}
@@ -78,7 +78,7 @@
return false;
if (getClass() != obj.getClass())
return false;
- tags_user_map other = (tags_user_map) obj;
+ TagsUserMap other = (TagsUserMap) obj;
if (tagId == null) {
if (other.tagId != 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 823b41b..46aa37b 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
@@ -4,7 +4,7 @@
import org.ovirt.engine.core.common.businessentities.tags;
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.TagsUserMap;
import org.ovirt.engine.core.common.businessentities.tags_vds_map;
import org.ovirt.engine.core.common.businessentities.tags_vm_map;
import org.ovirt.engine.core.common.businessentities.tags_vm_pool_map;
@@ -166,13 +166,13 @@
List<TagsUserGroupMap> getTagUserGroupMapsForTagName(String tagName);
- tags_user_map getTagUserByTagIdAndByuserId(Guid tagId, Guid userId);
+ TagsUserMap getTagUserByTagIdAndByuserId(Guid tagId, Guid userId);
- void attachUserToTag(tags_user_map tagUserMap);
+ void attachUserToTag(TagsUserMap tagUserMap);
void detachUserFromTag(Guid tagId, Guid userId);
- List<tags_user_map> getTagUserMapByTagName(String tagName);
+ List<TagsUserMap> getTagUserMapByTagName(String tagName);
tags_vds_map 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 c685af6..7892433 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
@@ -7,7 +7,7 @@
import org.ovirt.engine.core.common.businessentities.TagsType;
import org.ovirt.engine.core.common.businessentities.tags;
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.TagsUserMap;
import org.ovirt.engine.core.common.businessentities.tags_vds_map;
import org.ovirt.engine.core.common.businessentities.tags_vm_map;
import org.ovirt.engine.core.common.businessentities.tags_vm_pool_map;
@@ -278,14 +278,14 @@
}
@Override
- public tags_user_map getTagUserByTagIdAndByuserId(Guid tagId, Guid userId)
{
+ public TagsUserMap getTagUserByTagIdAndByuserId(Guid tagId, Guid userId) {
MapSqlParameterSource parameterSource =
getCustomMapSqlParameterSource().addValue("tag_id", tagId).addValue(
"user_id", userId);
- ParameterizedRowMapper<tags_user_map> mapper = new
ParameterizedRowMapper<tags_user_map>() {
+ ParameterizedRowMapper<TagsUserMap> mapper = new
ParameterizedRowMapper<TagsUserMap>() {
@Override
- public tags_user_map mapRow(ResultSet rs, int rowNum) throws
SQLException {
- tags_user_map entity = new tags_user_map();
+ 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;
@@ -297,7 +297,7 @@
}
@Override
- public void attachUserToTag(tags_user_map tagUserMap) {
+ public void attachUserToTag(TagsUserMap tagUserMap) {
MapSqlParameterSource parameterSource =
getCustomMapSqlParameterSource().addValue("tag_id",
tagUserMap.gettag_id()).addValue("user_id",
tagUserMap.getuser_id());
@@ -316,13 +316,13 @@
@SuppressWarnings("unchecked")
@Override
- public List<tags_user_map> getTagUserMapByTagName(String tagName) {
+ public List<TagsUserMap> getTagUserMapByTagName(String tagName) {
MapSqlParameterSource parameterSource =
getCustomMapSqlParameterSource().addValue("tag_name", tagName);
- ParameterizedRowMapper<tags_user_map> mapper = new
ParameterizedRowMapper<tags_user_map>() {
+ ParameterizedRowMapper<TagsUserMap> mapper = new
ParameterizedRowMapper<TagsUserMap>() {
@Override
- public tags_user_map mapRow(ResultSet rs, int rowNum) throws
SQLException {
- tags_user_map entity = new tags_user_map();
+ 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;
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 01d8bdb..f08b7cb 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
@@ -10,7 +10,7 @@
import org.ovirt.engine.core.common.businessentities.TagsType;
import org.ovirt.engine.core.common.businessentities.tags;
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.TagsUserMap;
import org.ovirt.engine.core.common.businessentities.tags_vds_map;
import org.ovirt.engine.core.common.businessentities.TagsVdsMapId;
import org.ovirt.engine.core.common.businessentities.tags_vm_map;
@@ -140,7 +140,7 @@
}
@Override
- public tags_user_map getTagUserByTagIdAndByuserId(Guid tagId, Guid userId)
{
+ public TagsUserMap getTagUserByTagIdAndByuserId(Guid tagId, Guid userId) {
return tagUserMapDAO.findOneByCriteria(Restrictions.eq("tagId",
tagId), Restrictions.eq("userId", userId));
}
@@ -150,7 +150,7 @@
}
@Override
- public void attachUserToTag(tags_user_map tagUserMap) {
+ public void attachUserToTag(TagsUserMap tagUserMap) {
tagUserMapDAO.save(tagUserMap);
}
@@ -160,7 +160,7 @@
}
@Override
- public List<tags_user_map> getTagUserMapByTagName(String tagName) {
+ public List<TagsUserMap> getTagUserMapByTagName(String tagName) {
return tagUserMapDAO.getTaguserMapByTagName(tagName);
}
diff --git
a/backend/manager/modules/dal/src/main/java/org/ovirt/engine/core/dao/tags/TagUserMapDAO.java
b/backend/manager/modules/dal/src/main/java/org/ovirt/engine/core/dao/tags/TagUserMapDAO.java
index 54f0401..0bf11b0 100644
---
a/backend/manager/modules/dal/src/main/java/org/ovirt/engine/core/dao/tags/TagUserMapDAO.java
+++
b/backend/manager/modules/dal/src/main/java/org/ovirt/engine/core/dao/tags/TagUserMapDAO.java
@@ -5,17 +5,17 @@
import org.hibernate.Query;
import org.hibernate.Session;
-import org.ovirt.engine.core.common.businessentities.tags_user_map;
+import org.ovirt.engine.core.common.businessentities.TagsUserMap;
import org.ovirt.engine.core.compat.Guid;
import org.ovirt.engine.core.dao.BaseDAOHibernateImpl;
-public class TagUserMapDAO extends BaseDAOHibernateImpl<tags_user_map, Guid> {
+public class TagUserMapDAO extends BaseDAOHibernateImpl<TagsUserMap, Guid> {
public TagUserMapDAO() {
- super(tags_user_map.class);
+ super(TagsUserMap.class);
}
@SuppressWarnings("unchecked")
- public List<tags_user_map> getTaguserMapByTagName(String tagName) {
+ public List<TagsUserMap> getTaguserMapByTagName(String tagName) {
Session session = getSession();
Query query = session.getNamedQuery("all_tag_user_maps_by_tag_name");
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 56fb865..fc202ff 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
@@ -54,7 +54,7 @@
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.TagsUserGroupMap;
-import org.ovirt.engine.core.common.businessentities.tags_user_map;
+import org.ovirt.engine.core.common.businessentities.TagsUserMap;
import org.ovirt.engine.core.common.businessentities.tags_vds_map;
import org.ovirt.engine.core.common.businessentities.tags_vm_map;
import org.ovirt.engine.core.common.businessentities.tags_vm_pool_map;
@@ -224,7 +224,7 @@
.addAnnotatedClass(storage_server_connections.class)
.addAnnotatedClass(tags.class)
.addAnnotatedClass(TagsUserGroupMap.class)
- .addAnnotatedClass(tags_user_map.class)
+ .addAnnotatedClass(TagsUserMap.class)
.addAnnotatedClass(tags_vds_map.class)
.addAnnotatedClass(tags_vm_map.class)
.addAnnotatedClass(tags_vm_pool_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 c099f62..68520bf 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
@@ -9,7 +9,7 @@
import org.ovirt.engine.core.common.businessentities.tags;
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.TagsUserMap;
import org.ovirt.engine.core.common.businessentities.tags_vds_map;
import org.ovirt.engine.core.common.businessentities.tags_vm_map;
import org.ovirt.engine.core.compat.Guid;
@@ -35,7 +35,7 @@
private Guid user;
private Guid vm;
private TagsUserGroupMap existingUserGroupTag;
- private tags_user_map existingUserTag;
+ private TagsUserMap existingUserTag;
private tags_vds_map existingVdsTag;
private tags_vds_map newVdsTag;
private tags_vm_map existingVmTag;
@@ -375,14 +375,14 @@
@Test
public void testGetUserTag() {
- tags_user_map result =
+ TagsUserMap result =
dao.getTagUserByTagIdAndByuserId(existingUserTag.gettag_id(),
existingUserTag.getuser_id());
assertNotNull(result);
assertEqualsTagUserMap(existingUserTag,result);
}
- private void assertEqualsTagUserMap(tags_user_map existing, tags_user_map
result) {
+ private void assertEqualsTagUserMap(TagsUserMap existing, TagsUserMap
result) {
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);
@@ -390,11 +390,11 @@
@Test
public void testGetTagUserMapByTagName() {
- List<tags_user_map> result =
dao.getTagUserMapByTagName(existingTag.gettag_name());
+ List<TagsUserMap> result =
dao.getTagUserMapByTagName(existingTag.gettag_name());
assertNotNull(result);
assertFalse(result.isEmpty());
- for (tags_user_map mapping : result) {
+ for (TagsUserMap mapping : result) {
assertEquals(existingTag.gettag_id(), mapping.gettag_id());
}
}
--
To view, visit http://gerrit.ovirt.org/10079
To unsubscribe, visit http://gerrit.ovirt.org/settings
Gerrit-MessageType: newchange
Gerrit-Change-Id: I64dafb5d61f94d1fc3916a612ff314fbbd550935
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
