Sharad Mishra has uploaded a new change for review.
Change subject: core: Renamed event_map.java to EventMap.java
......................................................................
core: Renamed event_map.java to EventMap.java
Change-Id: If79d19988555eefd7c94e5f8989a01910b3a41e9
Signed-off-by: Sharad Mishra <snmis...@linux.vnet.ibm.com>
---
M
backend/manager/modules/bll/src/main/java/org/ovirt/engine/core/bll/AddEventSubscriptionCommand.java
M
backend/manager/modules/bll/src/main/java/org/ovirt/engine/core/bll/RemoveEventSubscriptionCommand.java
R
backend/manager/modules/common/src/main/java/org/ovirt/engine/core/common/businessentities/EventMap.java
M
backend/manager/modules/dal/src/main/java/org/ovirt/engine/core/dao/EventDAO.java
M
backend/manager/modules/dal/src/main/java/org/ovirt/engine/core/dao/EventDAODbFacadeImpl.java
M
backend/manager/modules/dal/src/main/java/org/ovirt/engine/core/dao/EventDAOWrapperImpl.java
M
backend/manager/modules/dal/src/main/java/org/ovirt/engine/core/dao/events/MapDAOHibernateImpl.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/EventDAOTest.java
9 files changed, 33 insertions(+), 31 deletions(-)
git pull ssh://gerrit.ovirt.org:29418/ovirt-engine refs/changes/53/10053/1
diff --git
a/backend/manager/modules/bll/src/main/java/org/ovirt/engine/core/bll/AddEventSubscriptionCommand.java
b/backend/manager/modules/bll/src/main/java/org/ovirt/engine/core/bll/AddEventSubscriptionCommand.java
index 8486bbf..2ce5428 100644
---
a/backend/manager/modules/bll/src/main/java/org/ovirt/engine/core/bll/AddEventSubscriptionCommand.java
+++
b/backend/manager/modules/bll/src/main/java/org/ovirt/engine/core/bll/AddEventSubscriptionCommand.java
@@ -5,7 +5,7 @@
import org.ovirt.engine.core.common.action.EventSubscriptionParametesBase;
import org.ovirt.engine.core.common.businessentities.DbUser;
-import org.ovirt.engine.core.common.businessentities.event_map;
+import org.ovirt.engine.core.common.businessentities.EventMap;
import
org.ovirt.engine.core.common.businessentities.event_notification_methods;
import org.ovirt.engine.core.common.businessentities.event_subscriber;
import org.ovirt.engine.core.common.users.VdcUser;
@@ -40,7 +40,7 @@
.getEventDao().getEventNotificationMethodsById(method_id));
if (event_notification_methods.size() > 0) {
// validate event
- List<event_map> event_map =
DbFacade.getInstance().getEventDao().getEventMapByName(event_name);
+ List<EventMap> event_map =
DbFacade.getInstance().getEventDao().getEventMapByName(event_name);
if (event_map.size() > 0) {
String domain = getParameters().getDomain();
// Validate user
diff --git
a/backend/manager/modules/bll/src/main/java/org/ovirt/engine/core/bll/RemoveEventSubscriptionCommand.java
b/backend/manager/modules/bll/src/main/java/org/ovirt/engine/core/bll/RemoveEventSubscriptionCommand.java
index 8e1c1bf..468ab07 100644
---
a/backend/manager/modules/bll/src/main/java/org/ovirt/engine/core/bll/RemoveEventSubscriptionCommand.java
+++
b/backend/manager/modules/bll/src/main/java/org/ovirt/engine/core/bll/RemoveEventSubscriptionCommand.java
@@ -4,7 +4,7 @@
import org.ovirt.engine.core.common.action.EventSubscriptionParametesBase;
import org.ovirt.engine.core.common.businessentities.DbUser;
-import org.ovirt.engine.core.common.businessentities.event_map;
+import org.ovirt.engine.core.common.businessentities.EventMap;
import
org.ovirt.engine.core.common.businessentities.event_notification_methods;
import org.ovirt.engine.core.dal.VdcBllMessages;
import org.ovirt.engine.core.dal.dbbroker.DbFacade;
@@ -23,7 +23,7 @@
.getEventDao().getEventNotificationMethodsById(getParameters().getEventSubscriber().getmethod_id()));
if (event_notification_methods.size() > 0) {
// validate event
- List<event_map> event_map =
DbFacade.getInstance().getEventDao().getEventMapByName(
+ List<EventMap> event_map =
DbFacade.getInstance().getEventDao().getEventMapByName(
getParameters().getEventSubscriber().getevent_up_name());
if (event_map.size() > 0) {
// Validate user
diff --git
a/backend/manager/modules/common/src/main/java/org/ovirt/engine/core/common/businessentities/event_map.java
b/backend/manager/modules/common/src/main/java/org/ovirt/engine/core/common/businessentities/EventMap.java
similarity index 95%
rename from
backend/manager/modules/common/src/main/java/org/ovirt/engine/core/common/businessentities/event_map.java
rename to
backend/manager/modules/common/src/main/java/org/ovirt/engine/core/common/businessentities/EventMap.java
index a0c995e..26b0715 100644
---
a/backend/manager/modules/common/src/main/java/org/ovirt/engine/core/common/businessentities/event_map.java
+++
b/backend/manager/modules/common/src/main/java/org/ovirt/engine/core/common/businessentities/EventMap.java
@@ -12,7 +12,7 @@
@Entity
@Table(name = "event_map")
-public class event_map implements Serializable {
+public class EventMap implements Serializable {
private static final long serialVersionUID = 3159004698645803750L;
@EmbeddedId
@@ -27,7 +27,7 @@
@Transient
private int eventUpId;
- public event_map() {
+ public EventMap() {
}
public int getevent_down_id() {
diff --git
a/backend/manager/modules/dal/src/main/java/org/ovirt/engine/core/dao/EventDAO.java
b/backend/manager/modules/dal/src/main/java/org/ovirt/engine/core/dao/EventDAO.java
index b00fc56..3bb862a 100644
---
a/backend/manager/modules/dal/src/main/java/org/ovirt/engine/core/dao/EventDAO.java
+++
b/backend/manager/modules/dal/src/main/java/org/ovirt/engine/core/dao/EventDAO.java
@@ -2,7 +2,7 @@
import java.util.List;
-import org.ovirt.engine.core.common.businessentities.event_map;
+import org.ovirt.engine.core.common.businessentities.EventMap;
import
org.ovirt.engine.core.common.businessentities.event_notification_methods;
import org.ovirt.engine.core.common.businessentities.event_subscriber;
import org.ovirt.engine.core.compat.Guid;
@@ -66,7 +66,7 @@
*/
void unsubscribe(event_subscriber subscriber);
- List<event_map> getEventMapByName(String event_up_name);
+ List<EventMap> getEventMapByName(String event_up_name);
- List<event_map> getAllEventMaps();
+ List<EventMap> getAllEventMaps();
}
diff --git
a/backend/manager/modules/dal/src/main/java/org/ovirt/engine/core/dao/EventDAODbFacadeImpl.java
b/backend/manager/modules/dal/src/main/java/org/ovirt/engine/core/dao/EventDAODbFacadeImpl.java
index 1104525..162a9a4 100644
---
a/backend/manager/modules/dal/src/main/java/org/ovirt/engine/core/dao/EventDAODbFacadeImpl.java
+++
b/backend/manager/modules/dal/src/main/java/org/ovirt/engine/core/dao/EventDAODbFacadeImpl.java
@@ -6,7 +6,7 @@
import org.springframework.jdbc.core.namedparam.MapSqlParameterSource;
import org.springframework.jdbc.core.simple.ParameterizedRowMapper;
import org.ovirt.engine.core.common.EventNotificationMethods;
-import org.ovirt.engine.core.common.businessentities.event_map;
+import org.ovirt.engine.core.common.businessentities.EventMap;
import
org.ovirt.engine.core.common.businessentities.event_notification_methods;
import org.ovirt.engine.core.common.businessentities.event_subscriber;
import org.ovirt.engine.core.compat.Guid;
@@ -157,13 +157,13 @@
@SuppressWarnings("unchecked")
@Override
- public List<event_map> getAllEventMaps() {
+ public List<EventMap> getAllEventMaps() {
MapSqlParameterSource parameterSource =
getCustomMapSqlParameterSource();
- ParameterizedRowMapper<event_map> mapper = new
ParameterizedRowMapper<event_map>() {
+ ParameterizedRowMapper<EventMap> mapper = new
ParameterizedRowMapper<EventMap>() {
@Override
- public event_map mapRow(ResultSet rs, int rowNum) throws
SQLException {
- event_map entity = new event_map();
+ public EventMap mapRow(ResultSet rs, int rowNum) throws
SQLException {
+ EventMap entity = new EventMap();
entity.setevent_up_name(rs.getString("event_up_name"));
entity.setevent_down_name(rs.getString("event_down_name"));
return entity;
@@ -175,13 +175,13 @@
@SuppressWarnings("unchecked")
@Override
- public List<event_map> getEventMapByName(String event_up_name) {
+ public List<EventMap> getEventMapByName(String event_up_name) {
MapSqlParameterSource parameterSource =
getCustomMapSqlParameterSource().addValue("event_name", event_up_name);
- ParameterizedRowMapper<event_map> mapper = new
ParameterizedRowMapper<event_map>() {
+ ParameterizedRowMapper<EventMap> mapper = new
ParameterizedRowMapper<EventMap>() {
@Override
- public event_map mapRow(ResultSet rs, int rowNum) throws
SQLException {
- event_map entity = new event_map();
+ public EventMap mapRow(ResultSet rs, int rowNum) throws
SQLException {
+ EventMap entity = new EventMap();
entity.setevent_up_name(rs.getString("event_up_name"));
entity.setevent_down_name(rs.getString("event_down_name"));
return entity;
diff --git
a/backend/manager/modules/dal/src/main/java/org/ovirt/engine/core/dao/EventDAOWrapperImpl.java
b/backend/manager/modules/dal/src/main/java/org/ovirt/engine/core/dao/EventDAOWrapperImpl.java
index d68f869..180bdde 100644
---
a/backend/manager/modules/dal/src/main/java/org/ovirt/engine/core/dao/EventDAOWrapperImpl.java
+++
b/backend/manager/modules/dal/src/main/java/org/ovirt/engine/core/dao/EventDAOWrapperImpl.java
@@ -4,7 +4,7 @@
import org.hibernate.Session;
-import org.ovirt.engine.core.common.businessentities.event_map;
+import org.ovirt.engine.core.common.businessentities.EventMap;
import org.ovirt.engine.core.common.businessentities.event_notification_hist;
import
org.ovirt.engine.core.common.businessentities.event_notification_methods;
import org.ovirt.engine.core.common.businessentities.event_subscriber;
@@ -75,12 +75,12 @@
}
@Override
- public List<event_map> getEventMapByName(String event_up_name) {
+ public List<EventMap> getEventMapByName(String event_up_name) {
return mapDAO.getByEventUpName(event_up_name);
}
@Override
- public List<event_map> getAllEventMaps() {
+ public List<EventMap> getAllEventMaps() {
return mapDAO.getAll();
}
diff --git
a/backend/manager/modules/dal/src/main/java/org/ovirt/engine/core/dao/events/MapDAOHibernateImpl.java
b/backend/manager/modules/dal/src/main/java/org/ovirt/engine/core/dao/events/MapDAOHibernateImpl.java
index 84f6683..aff617d 100644
---
a/backend/manager/modules/dal/src/main/java/org/ovirt/engine/core/dao/events/MapDAOHibernateImpl.java
+++
b/backend/manager/modules/dal/src/main/java/org/ovirt/engine/core/dao/events/MapDAOHibernateImpl.java
@@ -4,16 +4,18 @@
import org.hibernate.criterion.Restrictions;
-import org.ovirt.engine.core.common.businessentities.event_map;
+import org.ovirt.engine.core.dao.BaseDAOHibernateImpl;
+
+import org.ovirt.engine.core.common.businessentities.EventMap;
import org.ovirt.engine.core.common.businessentities.event_map_id;
import org.ovirt.engine.core.dao.BaseDAOHibernateImpl;
public class MapDAOHibernateImpl extends BaseDAOHibernateImpl<event_map,
event_map_id> {
public MapDAOHibernateImpl() {
- super(event_map.class);
+ super(EventMap.class);
}
- public List<event_map> getByEventUpName(String event_up_name) {
+ public List<EventMap> getByEventUpName(String event_up_name) {
return findByCriteria(Restrictions.eq("id.eventUpName",
event_up_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 7fd81ff..42aa2f7 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
@@ -38,7 +38,7 @@
import org.ovirt.engine.core.common.businessentities.ad_groups;
import org.ovirt.engine.core.common.businessentities.async_tasks;
import org.ovirt.engine.core.common.businessentities.bookmarks;
-import org.ovirt.engine.core.common.businessentities.event_map;
+import org.ovirt.engine.core.common.businessentities.EventMap;
import org.ovirt.engine.core.common.businessentities.event_notification_hist;
import
org.ovirt.engine.core.common.businessentities.event_notification_methods;
import org.ovirt.engine.core.common.businessentities.event_subscriber;
@@ -203,7 +203,7 @@
.addAnnotatedClass(DbUser.class)
.addAnnotatedClass(DiskImage.class)
.addAnnotatedClass(DiskImageDynamic.class)
- .addAnnotatedClass(event_map.class)
+ .addAnnotatedClass(EventMap.class)
.addAnnotatedClass(event_notification_hist.class)
.addAnnotatedClass(event_notification_methods.class)
.addAnnotatedClass(event_subscriber.class)
diff --git
a/backend/manager/modules/dal/src/test/java/org/ovirt/engine/core/dao/EventDAOTest.java
b/backend/manager/modules/dal/src/test/java/org/ovirt/engine/core/dao/EventDAOTest.java
index 3a26b72..0f099be 100644
---
a/backend/manager/modules/dal/src/test/java/org/ovirt/engine/core/dao/EventDAOTest.java
+++
b/backend/manager/modules/dal/src/test/java/org/ovirt/engine/core/dao/EventDAOTest.java
@@ -8,7 +8,7 @@
import org.junit.Test;
import org.ovirt.engine.core.common.EventNotificationMethods;
-import org.ovirt.engine.core.common.businessentities.event_map;
+import org.ovirt.engine.core.common.businessentities.EventMap;
import org.ovirt.engine.core.common.businessentities.event_notification_hist;
import
org.ovirt.engine.core.common.businessentities.event_notification_methods;
import org.ovirt.engine.core.common.businessentities.event_subscriber;
@@ -177,7 +177,7 @@
@Test
public void testGetEventMapByNameWithInvalidName() {
- List<event_map> result = dao.getEventMapByName("farkle");
+ List<EventMap> result = dao.getEventMapByName("farkle");
assertNotNull(result);
assertTrue(result.isEmpty());
@@ -185,17 +185,17 @@
@Test
public void testGetEventMapByName() {
- List<event_map> result = dao.getEventMapByName("TestRun");
+ List<EventMap> result = dao.getEventMapByName("TestRun");
assertNotNull(result);
- for (event_map mapping : result) {
+ for (EventMap mapping : result) {
assertEquals("TestRun", mapping.getevent_up_name());
}
}
@Test
public void testGetAllEventMaps() {
- List<event_map> result = dao.getAllEventMaps();
+ List<EventMap> result = dao.getAllEventMaps();
assertNotNull(result);
assertFalse(result.isEmpty());
--
To view, visit http://gerrit.ovirt.org/10053
To unsubscribe, visit http://gerrit.ovirt.org/settings
Gerrit-MessageType: newchange
Gerrit-Change-Id: If79d19988555eefd7c94e5f8989a01910b3a41e9
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
