Sharad Mishra has uploaded a new change for review.
Change subject: core: Renamed event_notification_methods.java to
EventNotificationMethod.java
......................................................................
core: Renamed event_notification_methods.java to EventNotificationMethod.java
Change-Id: I583ddb60b305af917db989f2dee0c22f0f7d5a24
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/EventSubscriptionCommandBase.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/EventNotificationMethod.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/NotificationMethodsDAOHibernateImpl.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
M
backend/manager/tools/engine-notifier/engine-notifier-service/src/main/java/org/ovirt/engine/core/notifier/NotificationService.java
M
backend/manager/tools/engine-notifier/engine-notifier-service/src/main/java/org/ovirt/engine/core/notifier/methods/EventMethodFiller.java
M
backend/manager/tools/engine-notifier/engine-notifier-service/src/main/java/org/ovirt/engine/core/notifier/methods/NotificationMethodMapBuilder.java
13 files changed, 57 insertions(+), 57 deletions(-)
git pull ssh://gerrit.ovirt.org:29418/ovirt-engine refs/changes/68/10068/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..3ac5b5b 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
@@ -6,7 +6,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.event_notification_methods;
+import org.ovirt.engine.core.common.businessentities.EventNotificationMethod;
import org.ovirt.engine.core.common.businessentities.event_subscriber;
import org.ovirt.engine.core.common.users.VdcUser;
import org.ovirt.engine.core.compat.Guid;
@@ -36,7 +36,7 @@
retValue = false;
} else {
// get notification method
- List<event_notification_methods> event_notification_methods =
(DbFacade.getInstance()
+ List<EventNotificationMethod> event_notification_methods =
(DbFacade.getInstance()
.getEventDao().getEventNotificationMethodsById(method_id));
if (event_notification_methods.size() > 0) {
// validate event
diff --git
a/backend/manager/modules/bll/src/main/java/org/ovirt/engine/core/bll/EventSubscriptionCommandBase.java
b/backend/manager/modules/bll/src/main/java/org/ovirt/engine/core/bll/EventSubscriptionCommandBase.java
index 8753ca6..a48a2d1 100644
---
a/backend/manager/modules/bll/src/main/java/org/ovirt/engine/core/bll/EventSubscriptionCommandBase.java
+++
b/backend/manager/modules/bll/src/main/java/org/ovirt/engine/core/bll/EventSubscriptionCommandBase.java
@@ -6,7 +6,7 @@
import org.ovirt.engine.core.common.EventNotificationMethods;
import org.ovirt.engine.core.common.action.EventSubscriptionParametesBase;
import org.ovirt.engine.core.common.businessentities.DbUser;
-import
org.ovirt.engine.core.common.businessentities.event_notification_methods;
+import org.ovirt.engine.core.common.businessentities.EventNotificationMethod;
import org.ovirt.engine.core.common.businessentities.event_subscriber;
import org.ovirt.engine.core.common.businessentities.tags;
import org.ovirt.engine.core.compat.Regex;
@@ -30,7 +30,7 @@
* The user.
* @return
*/
- protected boolean
ValidateNotificationMethod(java.util.List<event_notification_methods>
event_notification_methods,
+ protected boolean
ValidateNotificationMethod(java.util.List<EventNotificationMethod>
event_notification_methods,
event_subscriber
event_subscriber, DbUser user) {
boolean retValue = true;
EventNotificationMethods notificationMethod =
event_notification_methods.get(0).getmethod_type();
@@ -64,7 +64,7 @@
* The user.
* @return
*/
- protected boolean ValidateAdd(List<event_notification_methods>
event_notification_methods,
+ protected boolean ValidateAdd(List<EventNotificationMethod>
event_notification_methods,
event_subscriber event_subscriber, DbUser
user) {
String tagName = event_subscriber.gettag_name();
// validate notification method
@@ -77,7 +77,7 @@
return retValue;
}
- protected boolean ValidateRemove(List<event_notification_methods>
event_notification_methods,
+ protected boolean ValidateRemove(List<EventNotificationMethod>
event_notification_methods,
event_subscriber event_subscriber, DbUser
user) {
boolean retValue = false;
// check if user is subscribed to the event
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..9240148 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
@@ -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.event_notification_methods;
+import org.ovirt.engine.core.common.businessentities.EventNotificationMethod;
import org.ovirt.engine.core.dal.VdcBllMessages;
import org.ovirt.engine.core.dal.dbbroker.DbFacade;
@@ -19,7 +19,7 @@
protected boolean canDoAction() {
boolean retValue;
// get notification method
- List<event_notification_methods> event_notification_methods =
(DbFacade.getInstance()
+ List<EventNotificationMethod> event_notification_methods =
(DbFacade.getInstance()
.getEventDao().getEventNotificationMethodsById(getParameters().getEventSubscriber().getmethod_id()));
if (event_notification_methods.size() > 0) {
// validate event
diff --git
a/backend/manager/modules/common/src/main/java/org/ovirt/engine/core/common/businessentities/event_notification_methods.java
b/backend/manager/modules/common/src/main/java/org/ovirt/engine/core/common/businessentities/EventNotificationMethod.java
similarity index 85%
rename from
backend/manager/modules/common/src/main/java/org/ovirt/engine/core/common/businessentities/event_notification_methods.java
rename to
backend/manager/modules/common/src/main/java/org/ovirt/engine/core/common/businessentities/EventNotificationMethod.java
index 56a32be..604f861 100644
---
a/backend/manager/modules/common/src/main/java/org/ovirt/engine/core/common/businessentities/event_notification_methods.java
+++
b/backend/manager/modules/common/src/main/java/org/ovirt/engine/core/common/businessentities/EventNotificationMethod.java
@@ -12,13 +12,13 @@
@Entity
@Table(name = "event_notification_methods")
-public class event_notification_methods implements Serializable {
+public class EventNotificationMethod implements Serializable {
private static final long serialVersionUID = -8648391842192154307L;
- public event_notification_methods() {
+ public EventNotificationMethod() {
}
- public event_notification_methods(int method_id, String method_type) {
+ public EventNotificationMethod(int method_id, String method_type) {
this.methodId = method_id;
this.methodType = method_type;
}
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..5657c24 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
@@ -3,7 +3,7 @@
import java.util.List;
import org.ovirt.engine.core.common.businessentities.event_map;
-import
org.ovirt.engine.core.common.businessentities.event_notification_methods;
+import org.ovirt.engine.core.common.businessentities.EventNotificationMethod;
import org.ovirt.engine.core.common.businessentities.event_subscriber;
import org.ovirt.engine.core.compat.Guid;
@@ -34,11 +34,11 @@
*
* @return the event notificationet methods
*/
- List<event_notification_methods> getAllEventNotificationMethods();
+ List<EventNotificationMethod> getAllEventNotificationMethods();
- List<event_notification_methods> getEventNotificationMethodsById(int
method_id);
+ List<EventNotificationMethod> getEventNotificationMethodsById(int
method_id);
- List<event_notification_methods> getEventNotificationMethodsByType(String
method_type);
+ List<EventNotificationMethod> getEventNotificationMethodsByType(String
method_type);
/**
* Saves the provided subscriber.
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..6492684 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
@@ -7,7 +7,7 @@
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.event_notification_methods;
+import org.ovirt.engine.core.common.businessentities.EventNotificationMethod;
import org.ovirt.engine.core.common.businessentities.event_subscriber;
import org.ovirt.engine.core.compat.Guid;
@@ -66,14 +66,14 @@
@SuppressWarnings("unchecked")
@Override
- public List<event_notification_methods> getAllEventNotificationMethods() {
+ public List<EventNotificationMethod> getAllEventNotificationMethods() {
MapSqlParameterSource parameterSource =
getCustomMapSqlParameterSource();
- ParameterizedRowMapper<event_notification_methods> mapper =
- new ParameterizedRowMapper<event_notification_methods>() {
+ ParameterizedRowMapper<EventNotificationMethod> mapper =
+ new ParameterizedRowMapper<EventNotificationMethod>() {
@Override
- public event_notification_methods mapRow(ResultSet rs, int
rowNum) throws SQLException {
- event_notification_methods entity = new
event_notification_methods();
+ public EventNotificationMethod mapRow(ResultSet rs, int
rowNum) throws SQLException {
+ EventNotificationMethod entity = new
EventNotificationMethod();
entity.setmethod_id(rs.getInt("method_id"));
entity.setmethod_type(EventNotificationMethods.EMAIL);
return entity;
@@ -85,14 +85,14 @@
@SuppressWarnings("unchecked")
@Override
- public List<event_notification_methods>
getEventNotificationMethodsById(int method_id) {
+ public List<EventNotificationMethod> getEventNotificationMethodsById(int
method_id) {
MapSqlParameterSource parameterSource =
getCustomMapSqlParameterSource().addValue("method_id", method_id);
- ParameterizedRowMapper<event_notification_methods> mapper =
- new ParameterizedRowMapper<event_notification_methods>() {
+ ParameterizedRowMapper<EventNotificationMethod> mapper =
+ new ParameterizedRowMapper<EventNotificationMethod>() {
@Override
- public event_notification_methods mapRow(ResultSet rs, int
rowNum) throws SQLException {
- event_notification_methods entity = new
event_notification_methods();
+ public EventNotificationMethod mapRow(ResultSet rs, int
rowNum) throws SQLException {
+ EventNotificationMethod entity = new
EventNotificationMethod();
entity.setmethod_id(rs.getInt("method_id"));
entity.setmethod_type(EventNotificationMethods.EMAIL);
return entity;
@@ -104,14 +104,14 @@
@SuppressWarnings("unchecked")
@Override
- public List<event_notification_methods>
getEventNotificationMethodsByType(String method_type) {
+ public List<EventNotificationMethod>
getEventNotificationMethodsByType(String method_type) {
MapSqlParameterSource parameterSource =
getCustomMapSqlParameterSource().addValue("method_type", method_type);
- ParameterizedRowMapper<event_notification_methods> mapper =
- new ParameterizedRowMapper<event_notification_methods>() {
+ ParameterizedRowMapper<EventNotificationMethod> mapper =
+ new ParameterizedRowMapper<EventNotificationMethod>() {
@Override
- public event_notification_methods mapRow(ResultSet rs, int
rowNum) throws SQLException {
- event_notification_methods entity = new
event_notification_methods();
+ public EventNotificationMethod mapRow(ResultSet rs, int
rowNum) throws SQLException {
+ EventNotificationMethod entity = new
EventNotificationMethod();
entity.setmethod_id(rs.getInt("method_id"));
entity.setmethod_type(EventNotificationMethods.EMAIL);
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..27161a4 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
@@ -6,7 +6,7 @@
import org.ovirt.engine.core.common.businessentities.event_map;
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.EventNotificationMethod;
import org.ovirt.engine.core.common.businessentities.event_subscriber;
import org.ovirt.engine.core.common.businessentities.event_subscriber_id;
import org.ovirt.engine.core.compat.Guid;
@@ -42,17 +42,17 @@
}
@Override
- public List<event_notification_methods> getAllEventNotificationMethods() {
+ public List<EventNotificationMethod> getAllEventNotificationMethods() {
return notificationMethodsDAO.getAll();
}
@Override
- public List<event_notification_methods>
getEventNotificationMethodsById(int method_id) {
+ public List<EventNotificationMethod> getEventNotificationMethodsById(int
method_id) {
return
notificationMethodsDAO.getEventNotificationMethodsById(method_id);
}
@Override
- public List<event_notification_methods>
getEventNotificationMethodsByType(String method_type) {
+ public List<EventNotificationMethod>
getEventNotificationMethodsByType(String method_type) {
return
notificationMethodsDAO.getEventNotificationMethodsByType(method_type);
}
diff --git
a/backend/manager/modules/dal/src/main/java/org/ovirt/engine/core/dao/events/NotificationMethodsDAOHibernateImpl.java
b/backend/manager/modules/dal/src/main/java/org/ovirt/engine/core/dao/events/NotificationMethodsDAOHibernateImpl.java
index 8d06036..99473ad 100644
---
a/backend/manager/modules/dal/src/main/java/org/ovirt/engine/core/dao/events/NotificationMethodsDAOHibernateImpl.java
+++
b/backend/manager/modules/dal/src/main/java/org/ovirt/engine/core/dao/events/NotificationMethodsDAOHibernateImpl.java
@@ -4,19 +4,19 @@
import org.hibernate.criterion.Restrictions;
-import
org.ovirt.engine.core.common.businessentities.event_notification_methods;
+import org.ovirt.engine.core.common.businessentities.EventNotificationMethod;
import org.ovirt.engine.core.dao.BaseDAOHibernateImpl;
-public class NotificationMethodsDAOHibernateImpl extends
BaseDAOHibernateImpl<event_notification_methods, Integer> {
+public class NotificationMethodsDAOHibernateImpl extends
BaseDAOHibernateImpl<EventNotificationMethod, Integer> {
public NotificationMethodsDAOHibernateImpl() {
- super(event_notification_methods.class);
+ super(EventNotificationMethod.class);
}
- public List<event_notification_methods>
getEventNotificationMethodsById(int method_id) {
+ public List<EventNotificationMethod> getEventNotificationMethodsById(int
method_id) {
return findByCriteria(Restrictions.eq("methodId", method_id));
}
- public List<event_notification_methods>
getEventNotificationMethodsByType(String method_type) {
+ public List<EventNotificationMethod>
getEventNotificationMethodsByType(String method_type) {
return findByCriteria(Restrictions.eq("methodType", method_type));
}
}
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..ebe39bd 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
@@ -40,7 +40,7 @@
import org.ovirt.engine.core.common.businessentities.bookmarks;
import org.ovirt.engine.core.common.businessentities.event_map;
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.EventNotificationMethod;
import org.ovirt.engine.core.common.businessentities.event_subscriber;
import org.ovirt.engine.core.common.businessentities.image_storage_domain_map;
import org.ovirt.engine.core.common.businessentities.image_vm_map;
@@ -205,7 +205,7 @@
.addAnnotatedClass(DiskImageDynamic.class)
.addAnnotatedClass(event_map.class)
.addAnnotatedClass(event_notification_hist.class)
-
.addAnnotatedClass(event_notification_methods.class)
+ .addAnnotatedClass(EventNotificationMethod.class)
.addAnnotatedClass(event_subscriber.class)
.addAnnotatedClass(image_storage_domain_map.class)
.addAnnotatedClass(image_vm_map.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..cae9a4a 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
@@ -10,7 +10,7 @@
import org.ovirt.engine.core.common.EventNotificationMethods;
import org.ovirt.engine.core.common.businessentities.event_map;
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.EventNotificationMethod;
import org.ovirt.engine.core.common.businessentities.event_subscriber;
import org.ovirt.engine.core.compat.Guid;
@@ -87,7 +87,7 @@
@Test
public void testGetAllEventNotificationMethods() {
- List<event_notification_methods> result =
dao.getAllEventNotificationMethods();
+ List<EventNotificationMethod> result =
dao.getAllEventNotificationMethods();
assertNotNull(result);
assertFalse(result.isEmpty());
@@ -96,7 +96,7 @@
@Test
public void testGetEventNotificationMethodsById() {
- List<event_notification_methods> result =
dao.getEventNotificationMethodsById(1);
+ List<EventNotificationMethod> result =
dao.getEventNotificationMethodsById(1);
assertNotNull(result);
assertFalse(result.isEmpty());
@@ -107,12 +107,12 @@
public void testGetEventNotificationMethodsByType() {
String target = "Email";
- List<event_notification_methods> result =
+ List<EventNotificationMethod> result =
dao.getEventNotificationMethodsByType(target);
assertNotNull(result);
assertFalse(result.isEmpty());
- for (event_notification_methods method : result) {
+ for (EventNotificationMethod method : result) {
assertEquals(EventNotificationMethods.EMAIL,
method.getmethod_type());
}
}
diff --git
a/backend/manager/tools/engine-notifier/engine-notifier-service/src/main/java/org/ovirt/engine/core/notifier/NotificationService.java
b/backend/manager/tools/engine-notifier/engine-notifier-service/src/main/java/org/ovirt/engine/core/notifier/NotificationService.java
index e9f5afc..c0f1f36 100644
---
a/backend/manager/tools/engine-notifier/engine-notifier-service/src/main/java/org/ovirt/engine/core/notifier/NotificationService.java
+++
b/backend/manager/tools/engine-notifier/engine-notifier-service/src/main/java/org/ovirt/engine/core/notifier/NotificationService.java
@@ -21,7 +21,7 @@
import org.ovirt.engine.core.common.businessentities.DbUser;
import
org.ovirt.engine.core.common.businessentities.event_audit_log_subscriber;
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.EventNotificationMethod;
import org.ovirt.engine.core.compat.Guid;
import org.ovirt.engine.core.compat.NGuid;
import org.ovirt.engine.core.notifier.methods.EventMethodFiller;
@@ -168,7 +168,7 @@
}
}
- List<event_notification_methods> eventNotificationMethods =
methodFiller.getEventNotificationMethods();
+ List<EventNotificationMethod> eventNotificationMethods =
methodFiller.getEventNotificationMethods();
methodsMapper =
NotificationMethodMapBuilder.instance().createMethodsMapper(eventNotificationMethods,
prop);
}
diff --git
a/backend/manager/tools/engine-notifier/engine-notifier-service/src/main/java/org/ovirt/engine/core/notifier/methods/EventMethodFiller.java
b/backend/manager/tools/engine-notifier/engine-notifier-service/src/main/java/org/ovirt/engine/core/notifier/methods/EventMethodFiller.java
index d6b7d05..d280059 100644
---
a/backend/manager/tools/engine-notifier/engine-notifier-service/src/main/java/org/ovirt/engine/core/notifier/methods/EventMethodFiller.java
+++
b/backend/manager/tools/engine-notifier/engine-notifier-service/src/main/java/org/ovirt/engine/core/notifier/methods/EventMethodFiller.java
@@ -8,7 +8,7 @@
import java.util.List;
import org.ovirt.engine.core.common.EventNotificationMethods;
-import
org.ovirt.engine.core.common.businessentities.event_notification_methods;
+import org.ovirt.engine.core.common.businessentities.EventNotificationMethod;
/**
* Populates a event notification method list by a database content<br>
@@ -18,7 +18,7 @@
*/
public class EventMethodFiller {
- private List<event_notification_methods> methods = new
ArrayList<event_notification_methods>();
+ private List<EventNotificationMethod> methods = new
ArrayList<EventNotificationMethod>();
/**
* Populates the list of event notification methods by its content in
table <i>event_notification_methods</i>
@@ -32,9 +32,9 @@
try {
stmt = conn.createStatement();
rs = stmt.executeQuery("select * from event_notification_methods");
- event_notification_methods method;
+ EventNotificationMethod method;
while (rs.next()) {
- method = new event_notification_methods();
+ method = new EventNotificationMethod();
method.setmethod_id(rs.getInt("method_id"));
method.setmethod_type(getMethodTypeByName(rs.getString("method_type")));
methods.add(method);
@@ -66,7 +66,7 @@
* {@link #fillEventNotificationMethods(Connection)} was invoked
* @return list of configured notification methods
*/
- public List<event_notification_methods> getEventNotificationMethods() {
+ public List<EventNotificationMethod> getEventNotificationMethods() {
return methods;
}
}
diff --git
a/backend/manager/tools/engine-notifier/engine-notifier-service/src/main/java/org/ovirt/engine/core/notifier/methods/NotificationMethodMapBuilder.java
b/backend/manager/tools/engine-notifier/engine-notifier-service/src/main/java/org/ovirt/engine/core/notifier/methods/NotificationMethodMapBuilder.java
index b1e4d8f..36e7cce 100644
---
a/backend/manager/tools/engine-notifier/engine-notifier-service/src/main/java/org/ovirt/engine/core/notifier/methods/NotificationMethodMapBuilder.java
+++
b/backend/manager/tools/engine-notifier/engine-notifier-service/src/main/java/org/ovirt/engine/core/notifier/methods/NotificationMethodMapBuilder.java
@@ -5,7 +5,7 @@
import java.util.Map;
import org.ovirt.engine.core.common.EventNotificationMethods;
-import
org.ovirt.engine.core.common.businessentities.event_notification_methods;
+import org.ovirt.engine.core.common.businessentities.EventNotificationMethod;
import org.ovirt.engine.core.notifier.utils.sender.EventSender;
/**
@@ -60,11 +60,11 @@
* configuration properties for the factories
* @return a map of notification map and its factory
*/
- public NotificationMethodFactoryMapper
createMethodsMapper(List<event_notification_methods> notificationMethods,
+ public NotificationMethodFactoryMapper
createMethodsMapper(List<EventNotificationMethod> notificationMethods,
Map<String, String> properties) {
NotificationMethodFactoryMapper methodMapper = new
NotificationMethodFactoryMapper();
- for (event_notification_methods method : notificationMethods) {
+ for (EventNotificationMethod method : notificationMethods) {
if
(EventNotificationMethods.EMAIL.equals(method.getmethod_type())) {
methodMapper.addMethodFactory(EventNotificationMethods.EMAIL,
new NotificationMethodFactoryEmailImpl(properties));
--
To view, visit http://gerrit.ovirt.org/10068
To unsubscribe, visit http://gerrit.ovirt.org/settings
Gerrit-MessageType: newchange
Gerrit-Change-Id: I583ddb60b305af917db989f2dee0c22f0f7d5a24
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
