Sharad Mishra has uploaded a new change for review.
Change subject: core: Renamed tags_vds_map.java to TagsVdsMap.java
......................................................................
core: Renamed tags_vds_map.java to TagsVdsMap.java
Change-Id: Ib6d7b381023c36ca9e4d43ccf50c431707e6da78
Signed-off-by: Sharad Mishra <snmis...@linux.vnet.ibm.com>
---
M
backend/manager/modules/bll/src/main/java/org/ovirt/engine/core/bll/AttachVdsToTagCommand.java
R
backend/manager/modules/common/src/main/java/org/ovirt/engine/core/common/businessentities/TagsVdsMap.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/TagVdsMapDAO.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, 41 insertions(+), 41 deletions(-)
git pull ssh://gerrit.ovirt.org:29418/ovirt-engine refs/changes/80/10080/1
diff --git
a/backend/manager/modules/bll/src/main/java/org/ovirt/engine/core/bll/AttachVdsToTagCommand.java
b/backend/manager/modules/bll/src/main/java/org/ovirt/engine/core/bll/AttachVdsToTagCommand.java
index 0951931..a209b0f 100644
---
a/backend/manager/modules/bll/src/main/java/org/ovirt/engine/core/bll/AttachVdsToTagCommand.java
+++
b/backend/manager/modules/bll/src/main/java/org/ovirt/engine/core/bll/AttachVdsToTagCommand.java
@@ -3,7 +3,7 @@
import org.ovirt.engine.core.common.AuditLogType;
import org.ovirt.engine.core.common.action.AttachVdsToTagParameters;
import org.ovirt.engine.core.common.businessentities.VDS;
-import org.ovirt.engine.core.common.businessentities.tags_vds_map;
+import org.ovirt.engine.core.common.businessentities.TagsVdsMap;
import org.ovirt.engine.core.compat.Guid;
import org.ovirt.engine.core.dal.dbbroker.DbFacade;
@@ -15,7 +15,7 @@
@Override
protected void executeCommand() {
- tags_vds_map map;
+ TagsVdsMap map;
if (getTagId() != null) {
for (Guid vdsId : getVdsList()) {
VDS vds = DbFacade.getInstance().getVdsDao().get(vdsId);
@@ -23,7 +23,7 @@
if (vds != null) {
AppendCustomValue("VdsNames", vds.getvds_name(), ", ");
}
- map = new tags_vds_map(getTagId(), vdsId);
+ map = new TagsVdsMap(getTagId(), vdsId);
DbFacade.getInstance().getTagDao().attachVdsToTag(map);
noActionDone = false;
} else {
diff --git
a/backend/manager/modules/common/src/main/java/org/ovirt/engine/core/common/businessentities/tags_vds_map.java
b/backend/manager/modules/common/src/main/java/org/ovirt/engine/core/common/businessentities/TagsVdsMap.java
similarity index 92%
rename from
backend/manager/modules/common/src/main/java/org/ovirt/engine/core/common/businessentities/tags_vds_map.java
rename to
backend/manager/modules/common/src/main/java/org/ovirt/engine/core/common/businessentities/TagsVdsMap.java
index 26a1f36..294e98f 100644
---
a/backend/manager/modules/common/src/main/java/org/ovirt/engine/core/common/businessentities/tags_vds_map.java
+++
b/backend/manager/modules/common/src/main/java/org/ovirt/engine/core/common/businessentities/TagsVdsMap.java
@@ -18,7 +18,7 @@
@Entity
@Table(name = "tags_vds_map")
@TypeDef(name = "guid", typeClass = GuidType.class)
-public class tags_vds_map implements Serializable {
+public class TagsVdsMap implements Serializable {
private static final long serialVersionUID = 6203389145081594705L;
@EmbeddedId
@@ -30,10 +30,10 @@
@Column(name = "_create_date")
private Date created = new Date();
- public tags_vds_map() {
+ public TagsVdsMap() {
}
- public tags_vds_map(Guid tag_id, Guid vds_id) {
+ public TagsVdsMap(Guid tag_id, Guid vds_id) {
this.id.tagId = tag_id;
this.id.vdsId = vds_id;
}
@@ -71,7 +71,7 @@
return false;
if (getClass() != obj.getClass())
return false;
- tags_vds_map other = (tags_vds_map) obj;
+ TagsVdsMap other = (TagsVdsMap) obj;
if (id.tagId == null) {
if (other.id.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 46aa37b..ba754f5 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
@@ -5,7 +5,7 @@
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.tags_vds_map;
+import org.ovirt.engine.core.common.businessentities.TagsVdsMap;
import org.ovirt.engine.core.common.businessentities.tags_vm_map;
import org.ovirt.engine.core.common.businessentities.tags_vm_pool_map;
import org.ovirt.engine.core.compat.Guid;
@@ -174,13 +174,13 @@
List<TagsUserMap> getTagUserMapByTagName(String tagName);
- tags_vds_map getTagVdsByTagIdAndByVdsId(Guid tagId, Guid vdsId);
+ TagsVdsMap getTagVdsByTagIdAndByVdsId(Guid tagId, Guid vdsId);
- void attachVdsToTag(tags_vds_map tagVdsMap);
+ void attachVdsToTag(TagsVdsMap tagVdsMap);
void detachVdsFromTag(Guid tagId, Guid vdsId);
- List<tags_vds_map> getTagVdsMapByTagName(String tagName);
+ List<TagsVdsMap> getTagVdsMapByTagName(String tagName);
tags_vm_map getTagVmByTagIdAndByVmId(Guid tagId, Guid vmId);
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 7892433..012d6ef 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
@@ -8,7 +8,7 @@
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.tags_vds_map;
+import org.ovirt.engine.core.common.businessentities.TagsVdsMap;
import org.ovirt.engine.core.common.businessentities.tags_vm_map;
import org.ovirt.engine.core.common.businessentities.tags_vm_pool_map;
import org.ovirt.engine.core.compat.Guid;
@@ -334,14 +334,14 @@
}
@Override
- public tags_vds_map getTagVdsByTagIdAndByVdsId(Guid tagId, Guid vdsId) {
+ public TagsVdsMap getTagVdsByTagIdAndByVdsId(Guid tagId, Guid vdsId) {
MapSqlParameterSource parameterSource =
getCustomMapSqlParameterSource().addValue("tag_id", tagId).addValue(
"vds_id", vdsId);
- ParameterizedRowMapper<tags_vds_map> mapper = new
ParameterizedRowMapper<tags_vds_map>() {
+ ParameterizedRowMapper<TagsVdsMap> mapper = new
ParameterizedRowMapper<TagsVdsMap>() {
@Override
- public tags_vds_map mapRow(ResultSet rs, int rowNum) throws
SQLException {
- tags_vds_map entity = new tags_vds_map();
+ public TagsVdsMap mapRow(ResultSet rs, int rowNum) throws
SQLException {
+ TagsVdsMap entity = new TagsVdsMap();
entity.settag_id(Guid.createGuidFromString(rs.getString("tag_id")));
entity.setvds_id(Guid.createGuidFromString(rs.getString("vds_id")));
return entity;
@@ -353,7 +353,7 @@
}
@Override
- public void attachVdsToTag(tags_vds_map tagVdsMap) {
+ public void attachVdsToTag(TagsVdsMap tagVdsMap) {
MapSqlParameterSource parameterSource =
getCustomMapSqlParameterSource().addValue("tag_id",
tagVdsMap.gettag_id()).addValue("vds_id",
tagVdsMap.getvds_id());
@@ -372,13 +372,13 @@
@SuppressWarnings("unchecked")
@Override
- public List<tags_vds_map> getTagVdsMapByTagName(String tagName) {
+ public List<TagsVdsMap> getTagVdsMapByTagName(String tagName) {
MapSqlParameterSource parameterSource =
getCustomMapSqlParameterSource().addValue("tag_name", tagName);
- ParameterizedRowMapper<tags_vds_map> mapper = new
ParameterizedRowMapper<tags_vds_map>() {
+ ParameterizedRowMapper<TagsVdsMap> mapper = new
ParameterizedRowMapper<TagsVdsMap>() {
@Override
- public tags_vds_map mapRow(ResultSet rs, int rowNum) throws
SQLException {
- tags_vds_map entity = new tags_vds_map();
+ public TagsVdsMap mapRow(ResultSet rs, int rowNum) throws
SQLException {
+ TagsVdsMap entity = new TagsVdsMap();
entity.settag_id(Guid.createGuidFromString(rs.getString("tag_id")));
entity.setvds_id(Guid.createGuidFromString(rs.getString("vds_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 f08b7cb..7316adc 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
@@ -11,7 +11,7 @@
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.tags_vds_map;
+import org.ovirt.engine.core.common.businessentities.TagsVdsMap;
import org.ovirt.engine.core.common.businessentities.TagsVdsMapId;
import org.ovirt.engine.core.common.businessentities.tags_vm_map;
import org.ovirt.engine.core.common.businessentities.tags_vm_pool_map;
@@ -165,12 +165,12 @@
}
@Override
- public tags_vds_map getTagVdsByTagIdAndByVdsId(Guid tagId, Guid vdsId) {
+ public TagsVdsMap getTagVdsByTagIdAndByVdsId(Guid tagId, Guid vdsId) {
return tagVdsMapDAO.findOneByCriteria(Restrictions.eq("id.tagId",
tagId), Restrictions.eq("id.vdsId", vdsId));
}
@Override
- public void attachVdsToTag(tags_vds_map tagVdsMap) {
+ public void attachVdsToTag(TagsVdsMap tagVdsMap) {
tagVdsMapDAO.save(tagVdsMap);
}
@@ -180,13 +180,13 @@
}
@Override
- public List<tags_vds_map> getTagVdsMapByTagName(String tagName) {
+ public List<TagsVdsMap> getTagVdsMapByTagName(String tagName) {
tags tag = getByName(tagName);
if (tag != null) {
return tagVdsMapDAO.findByCriteria(Restrictions.eq("id.tagId",
tag.gettag_id()));
} else {
- return new ArrayList<tags_vds_map>();
+ return new ArrayList<TagsVdsMap>();
}
}
diff --git
a/backend/manager/modules/dal/src/main/java/org/ovirt/engine/core/dao/tags/TagVdsMapDAO.java
b/backend/manager/modules/dal/src/main/java/org/ovirt/engine/core/dao/tags/TagVdsMapDAO.java
index 615af66..a69e5af 100644
---
a/backend/manager/modules/dal/src/main/java/org/ovirt/engine/core/dao/tags/TagVdsMapDAO.java
+++
b/backend/manager/modules/dal/src/main/java/org/ovirt/engine/core/dao/tags/TagVdsMapDAO.java
@@ -1,11 +1,11 @@
package org.ovirt.engine.core.dao.tags;
-import org.ovirt.engine.core.common.businessentities.tags_vds_map;
+import org.ovirt.engine.core.common.businessentities.TagsVdsMap;
import org.ovirt.engine.core.common.businessentities.TagsVdsMapId;
import org.ovirt.engine.core.dao.BaseDAOHibernateImpl;
-public class TagVdsMapDAO extends BaseDAOHibernateImpl<tags_vds_map,
TagsVdsMapId> {
+public class TagVdsMapDAO extends BaseDAOHibernateImpl<TagsVdsMap,
TagsVdsMapId> {
public TagVdsMapDAO() {
- super(tags_vds_map.class);
+ super(TagsVdsMap.class);
}
}
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 fc202ff..4d9eacb 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
@@ -55,7 +55,7 @@
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.tags_vds_map;
+import org.ovirt.engine.core.common.businessentities.TagsVdsMap;
import org.ovirt.engine.core.common.businessentities.tags_vm_map;
import org.ovirt.engine.core.common.businessentities.tags_vm_pool_map;
import org.ovirt.engine.core.common.businessentities.vm_pool_map;
@@ -225,7 +225,7 @@
.addAnnotatedClass(tags.class)
.addAnnotatedClass(TagsUserGroupMap.class)
.addAnnotatedClass(TagsUserMap.class)
- .addAnnotatedClass(tags_vds_map.class)
+ .addAnnotatedClass(TagsVdsMap.class)
.addAnnotatedClass(tags_vm_map.class)
.addAnnotatedClass(tags_vm_pool_map.class)
.addAnnotatedClass(user_sessions.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 68520bf..1c038fc 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
@@ -10,7 +10,7 @@
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.tags_vds_map;
+import org.ovirt.engine.core.common.businessentities.TagsVdsMap;
import org.ovirt.engine.core.common.businessentities.tags_vm_map;
import org.ovirt.engine.core.compat.Guid;
@@ -36,8 +36,8 @@
private Guid vm;
private TagsUserGroupMap existingUserGroupTag;
private TagsUserMap existingUserTag;
- private tags_vds_map existingVdsTag;
- private tags_vds_map newVdsTag;
+ private TagsVdsMap existingVdsTag;
+ private TagsVdsMap newVdsTag;
private tags_vm_map existingVmTag;
private tags_vm_map newVmTag;
private Guid vmPool;
@@ -68,7 +68,7 @@
existingUserTag = dao.getTagUserByTagIdAndByuserId(EXISTING_TAG_ID,
EXISTING_USER_ID);
existingVdsTag = dao.getTagVdsByTagIdAndByVdsId(EXISTING_TAG_ID,
EXISTING_VDS_ID);
- newVdsTag = new tags_vds_map(EXISTING_TAG_ID, FREE_VDS_ID);
+ newVdsTag = new TagsVdsMap(EXISTING_TAG_ID, FREE_VDS_ID);
existingVmTag = dao.getTagVmByTagIdAndByVmId(EXISTING_TAG_ID,
EXISTING_VM_ID);
newVmTag = new tags_vm_map(EXISTING_TAG_ID, FREE_VM_ID);
@@ -401,13 +401,13 @@
@Test
public void testGetTagVdsMap() {
- tags_vds_map result =
dao.getTagVdsByTagIdAndByVdsId(existingVdsTag.gettag_id(),
existingVdsTag.getvds_id());
+ TagsVdsMap result =
dao.getTagVdsByTagIdAndByVdsId(existingVdsTag.gettag_id(),
existingVdsTag.getvds_id());
assertNotNull(result);
assertEqualsTagsVdsMap(existingVdsTag,result);
}
- private void assertEqualsTagsVdsMap(tags_vds_map existing, tags_vds_map
result) {
+ private void assertEqualsTagsVdsMap(TagsVdsMap existing, TagsVdsMap
result) {
assertEquals("Tag ID is not equal",existing.gettag_id(),
result.gettag_id());
assertEquals("VDS ID is not equal",existing.getvds_id(),
result.getvds_id());
assertEquals("Object equation",existing,result);
@@ -417,7 +417,7 @@
public void testAttachVdsToTag() {
dao.attachVdsToTag(newVdsTag);
- tags_vds_map result =
dao.getTagVdsByTagIdAndByVdsId(newVdsTag.gettag_id(), newVdsTag.getvds_id());
+ TagsVdsMap result =
dao.getTagVdsByTagIdAndByVdsId(newVdsTag.gettag_id(), newVdsTag.getvds_id());
assertNotNull(result);
assertEqualsTagsVdsMap(newVdsTag,result);
@@ -427,18 +427,18 @@
public void testDetachVdsFromTag() {
dao.detachVdsFromTag(existingVdsTag.gettag_id(),
existingVdsTag.getvds_id());
- tags_vds_map result =
dao.getTagVdsByTagIdAndByVdsId(existingVdsTag.gettag_id(),
existingVdsTag.getvds_id());
+ TagsVdsMap result =
dao.getTagVdsByTagIdAndByVdsId(existingVdsTag.gettag_id(),
existingVdsTag.getvds_id());
assertNull(result);
}
@Test
public void testGetTagVdsMapByTagName() {
- List<tags_vds_map> result =
dao.getTagVdsMapByTagName(existingTag.gettag_name());
+ List<TagsVdsMap> result =
dao.getTagVdsMapByTagName(existingTag.gettag_name());
assertNotNull(result);
assertFalse(result.isEmpty());
- for (tags_vds_map mapping : result) {
+ for (TagsVdsMap mapping : result) {
assertEquals(existingTag.gettag_id(), mapping.gettag_id());
}
}
--
To view, visit http://gerrit.ovirt.org/10080
To unsubscribe, visit http://gerrit.ovirt.org/settings
Gerrit-MessageType: newchange
Gerrit-Change-Id: Ib6d7b381023c36ca9e4d43ccf50c431707e6da78
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
