Sharad Mishra has uploaded a new change for review.
Change subject: core: Renamed tags_vm_pool_map.java to TagsVmPoolMap.java
......................................................................
core: Renamed tags_vm_pool_map.java to TagsVmPoolMap.java
Change-Id: Iba09b0770c37802086d9d14deb5c3882e3d1f611
Signed-off-by: Sharad Mishra <snmis...@linux.vnet.ibm.com>
---
R
backend/manager/modules/common/src/main/java/org/ovirt/engine/core/common/businessentities/TagsVmPoolMap.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/test/java/org/ovirt/engine/core/dao/BaseDAOTestCase.java
5 files changed, 15 insertions(+), 15 deletions(-)
git pull ssh://gerrit.ovirt.org:29418/ovirt-engine refs/changes/84/10084/1
diff --git
a/backend/manager/modules/common/src/main/java/org/ovirt/engine/core/common/businessentities/tags_vm_pool_map.java
b/backend/manager/modules/common/src/main/java/org/ovirt/engine/core/common/businessentities/TagsVmPoolMap.java
similarity index 91%
rename from
backend/manager/modules/common/src/main/java/org/ovirt/engine/core/common/businessentities/tags_vm_pool_map.java
rename to
backend/manager/modules/common/src/main/java/org/ovirt/engine/core/common/businessentities/TagsVmPoolMap.java
index 4e13532..c55844a 100644
---
a/backend/manager/modules/common/src/main/java/org/ovirt/engine/core/common/businessentities/tags_vm_pool_map.java
+++
b/backend/manager/modules/common/src/main/java/org/ovirt/engine/core/common/businessentities/TagsVmPoolMap.java
@@ -19,7 +19,7 @@
@Entity
@Table(name = "tags_vm_pool_map")
@TypeDef(name = "guid", typeClass = GuidType.class)
-public class tags_vm_pool_map implements Serializable {
+public class TagsVmPoolMap implements Serializable {
private static final long serialVersionUID = 1110697686039279639L;
@EmbeddedId
@@ -31,10 +31,10 @@
@Column(name = "_create_date")
private Date created = new Date();
- public tags_vm_pool_map() {
+ public TagsVmPoolMap() {
}
- public tags_vm_pool_map(Guid tag_id, NGuid vm_pool_id) {
+ public TagsVmPoolMap(Guid tag_id, NGuid vm_pool_id) {
this.id.tagId = tag_id;
this.id.vmPoolId = vm_pool_id;
}
@@ -72,7 +72,7 @@
return false;
if (getClass() != obj.getClass())
return false;
- tags_vm_pool_map other = (tags_vm_pool_map) obj;
+ TagsVmPoolMap other = (TagsVmPoolMap) obj;
if (created == null) {
if (other.created != 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 d580933..892cc11 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
@@ -7,7 +7,7 @@
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_vm_pool_map;
+import org.ovirt.engine.core.common.businessentities.TagsVmPoolMap;
import org.ovirt.engine.core.compat.Guid;
import org.ovirt.engine.core.compat.NGuid;
@@ -196,5 +196,5 @@
List<TagsVmMap> getTimeLeasedUserVmsByAdGroupAndVmPoolId(Guid adGroupId,
Guid vmPoolId);
- List<tags_vm_pool_map> getVmPoolTagsByVmPoolIdAndAdElementId(NGuid
vmPoolId, Guid adElementId);
+ List<TagsVmPoolMap> getVmPoolTagsByVmPoolIdAndAdElementId(NGuid vmPoolId,
Guid adElementId);
}
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 364363d..ed7b2f8 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
@@ -10,7 +10,7 @@
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_vm_pool_map;
+import org.ovirt.engine.core.common.businessentities.TagsVmPoolMap;
import org.ovirt.engine.core.compat.Guid;
import org.ovirt.engine.core.compat.NGuid;
import org.springframework.jdbc.core.namedparam.MapSqlParameterSource;
@@ -503,14 +503,14 @@
@SuppressWarnings("unchecked")
@Override
- public List<tags_vm_pool_map> getVmPoolTagsByVmPoolIdAndAdElementId(NGuid
vmPoolId, Guid adElementId) {
+ public List<TagsVmPoolMap> getVmPoolTagsByVmPoolIdAndAdElementId(NGuid
vmPoolId, Guid adElementId) {
MapSqlParameterSource parameterSource =
getCustomMapSqlParameterSource().addValue("ad_id", adElementId)
.addValue("vm_pool_id", vmPoolId);
- ParameterizedRowMapper<tags_vm_pool_map> mapper = new
ParameterizedRowMapper<tags_vm_pool_map>() {
+ ParameterizedRowMapper<TagsVmPoolMap> mapper = new
ParameterizedRowMapper<TagsVmPoolMap>() {
@Override
- public tags_vm_pool_map mapRow(ResultSet rs, int rowNum) throws
SQLException {
- tags_vm_pool_map entity = new tags_vm_pool_map();
+ public TagsVmPoolMap mapRow(ResultSet rs, int rowNum) throws
SQLException {
+ TagsVmPoolMap entity = new TagsVmPoolMap();
entity.settag_id(Guid.createGuidFromString(rs.getString("tag_id")));
entity.setvm_pool_id(Guid.createGuidFromString(rs.getString("vm_pool_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 7e1509c..51da3c2 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
@@ -14,7 +14,7 @@
import org.ovirt.engine.core.common.businessentities.TagsVdsMap;
import org.ovirt.engine.core.common.businessentities.TagsVdsMapId;
import org.ovirt.engine.core.common.businessentities.TagsVmMap;
-import org.ovirt.engine.core.common.businessentities.tags_vm_pool_map;
+import org.ovirt.engine.core.common.businessentities.TagsVmPoolMap;
import org.ovirt.engine.core.compat.Guid;
import org.ovirt.engine.core.compat.NGuid;
import org.ovirt.engine.core.dao.tags.TagUserGroupMapDAO;
@@ -240,7 +240,7 @@
}
@Override
- public List<tags_vm_pool_map> getVmPoolTagsByVmPoolIdAndAdElementId(NGuid
vmPoolId, Guid adElementId) {
+ public List<TagsVmPoolMap> getVmPoolTagsByVmPoolIdAndAdElementId(NGuid
vmPoolId, Guid adElementId) {
// TODO Auto-generated method stub
return null;
}
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 2f492f6..8b12e92 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
@@ -57,7 +57,7 @@
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_vm_pool_map;
+import org.ovirt.engine.core.common.businessentities.TagsVmPoolMap;
import org.ovirt.engine.core.common.businessentities.vm_pool_map;
import org.ovirt.engine.core.common.businessentities.vm_pools;
import org.ovirt.engine.core.common.businessentities.vm_template_image_map;
@@ -227,7 +227,7 @@
.addAnnotatedClass(TagsUserMap.class)
.addAnnotatedClass(TagsVdsMap.class)
.addAnnotatedClass(TagsVmMap.class)
- .addAnnotatedClass(tags_vm_pool_map.class)
+ .addAnnotatedClass(TagsVmPoolMap.class)
.addAnnotatedClass(user_sessions.class)
.addAnnotatedClass(VdcOption.class)
.addAnnotatedClass(VdsDynamic.class)
--
To view, visit http://gerrit.ovirt.org/10084
To unsubscribe, visit http://gerrit.ovirt.org/settings
Gerrit-MessageType: newchange
Gerrit-Change-Id: Iba09b0770c37802086d9d14deb5c3882e3d1f611
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
