Sharad Mishra has uploaded a new change for review.
Change subject: core: Renamed event_audit_log_subscriber.java to
EventAuditLogSubscriber.java
......................................................................
core: Renamed event_audit_log_subscriber.java to EventAuditLogSubscriber.java
Change-Id: I2be0dc94e27ca51065bfc9c2db601e595d64509e
Signed-off-by: Sharad Mishra <snmis...@linux.vnet.ibm.com>
---
R
backend/manager/modules/common/src/main/java/org/ovirt/engine/core/common/businessentities/EventAuditLogSubscriber.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/utils/sender/EventSender.java
M
backend/manager/tools/engine-notifier/engine-notifier-service/src/main/java/org/ovirt/engine/core/notifier/utils/sender/mail/EventMessageContent.java
M
backend/manager/tools/engine-notifier/engine-notifier-service/src/main/java/org/ovirt/engine/core/notifier/utils/sender/mail/EventSenderMailImpl.java
M
backend/manager/tools/engine-notifier/engine-notifier-service/src/test/java/org/ovirt/engine/core/notifier/utils/mail/MailSenderTest.java
6 files changed, 21 insertions(+), 21 deletions(-)
git pull ssh://gerrit.ovirt.org:29418/ovirt-engine refs/changes/51/10051/1
diff --git
a/backend/manager/modules/common/src/main/java/org/ovirt/engine/core/common/businessentities/event_audit_log_subscriber.java
b/backend/manager/modules/common/src/main/java/org/ovirt/engine/core/common/businessentities/EventAuditLogSubscriber.java
similarity index 96%
rename from
backend/manager/modules/common/src/main/java/org/ovirt/engine/core/common/businessentities/event_audit_log_subscriber.java
rename to
backend/manager/modules/common/src/main/java/org/ovirt/engine/core/common/businessentities/EventAuditLogSubscriber.java
index 200242c..375e2b1 100644
---
a/backend/manager/modules/common/src/main/java/org/ovirt/engine/core/common/businessentities/event_audit_log_subscriber.java
+++
b/backend/manager/modules/common/src/main/java/org/ovirt/engine/core/common/businessentities/EventAuditLogSubscriber.java
@@ -5,13 +5,13 @@
import org.ovirt.engine.core.compat.Guid;
import org.ovirt.engine.core.compat.NGuid;
-public class event_audit_log_subscriber implements Serializable {
+public class EventAuditLogSubscriber implements Serializable {
private static final long serialVersionUID = 2766057261065080144L;
- public event_audit_log_subscriber() {
+ public EventAuditLogSubscriber() {
}
- public event_audit_log_subscriber(int event_type, Guid subscriber_id,
String event_up_name, int method_id,
+ public EventAuditLogSubscriber(int event_type, Guid subscriber_id, String
event_up_name, int method_id,
String method_address, String tag_name, long audit_log_id, NGuid
user_id, String user_name, NGuid vm_id,
String vm_name, NGuid vm_template_id, String vm_template_name,
NGuid vds_id, String vds_name,
Guid storage_pool_id, String storage_pool_name, Guid
storage_domain_id, String storage_domain_name,
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..aede815 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
@@ -19,7 +19,7 @@
import org.apache.commons.logging.LogFactory;
import org.ovirt.engine.core.common.EventNotificationMethods;
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.EventAuditLogSubscriber;
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.compat.Guid;
@@ -184,7 +184,7 @@
Connection connection = null;
PreparedStatement ps = null;
ResultSet rs = null;
- List<event_audit_log_subscriber> eventSubscribers = new
ArrayList<event_audit_log_subscriber>();
+ List<EventAuditLogSubscriber> eventSubscribers = new
ArrayList<EventAuditLogSubscriber>();
try {
connection = ds.getConnection();
ps =
@@ -199,7 +199,7 @@
DbUtils.closeQuietly(rs, ps, connection);
}
DbUser dbUser = null;
- for (event_audit_log_subscriber eventSubscriber:eventSubscribers) {
+ for (EventAuditLogSubscriber eventSubscriber:eventSubscribers) {
dbUser = getUserByUserId(eventSubscriber.getsubscriber_id());
if (dbUser != null) {
EventSender method =
@@ -221,7 +221,7 @@
}
}
- private void updateAuditLogEventProcessed(event_audit_log_subscriber
eventSubscriber) throws SQLException {
+ private void updateAuditLogEventProcessed(EventAuditLogSubscriber
eventSubscriber) throws SQLException {
Connection connection = null;
PreparedStatement ps = null;
try {
@@ -259,7 +259,7 @@
}
}
- private event_notification_hist
geteventNotificationHist(event_audit_log_subscriber eals,
+ private event_notification_hist
geteventNotificationHist(EventAuditLogSubscriber eals,
boolean isNotified,
String reason) {
event_notification_hist eventHistory = new event_notification_hist();
@@ -297,8 +297,8 @@
return dbUser;
}
- private event_audit_log_subscriber getEventAuditLogSubscriber(ResultSet
rs) throws SQLException {
- event_audit_log_subscriber eals = new event_audit_log_subscriber();
+ private EventAuditLogSubscriber getEventAuditLogSubscriber(ResultSet rs)
throws SQLException {
+ EventAuditLogSubscriber eals = new EventAuditLogSubscriber();
eals.setevent_type(rs.getInt("event_type"));
eals.setsubscriber_id(Guid.createGuidFromString(rs.getString("subscriber_id")));
eals.setevent_up_name(rs.getString("event_up_name"));
diff --git
a/backend/manager/tools/engine-notifier/engine-notifier-service/src/main/java/org/ovirt/engine/core/notifier/utils/sender/EventSender.java
b/backend/manager/tools/engine-notifier/engine-notifier-service/src/main/java/org/ovirt/engine/core/notifier/utils/sender/EventSender.java
index 9252985..dbaffcc 100644
---
a/backend/manager/tools/engine-notifier/engine-notifier-service/src/main/java/org/ovirt/engine/core/notifier/utils/sender/EventSender.java
+++
b/backend/manager/tools/engine-notifier/engine-notifier-service/src/main/java/org/ovirt/engine/core/notifier/utils/sender/EventSender.java
@@ -1,6 +1,6 @@
package org.ovirt.engine.core.notifier.utils.sender;
-import
org.ovirt.engine.core.common.businessentities.event_audit_log_subscriber;
+import org.ovirt.engine.core.common.businessentities.EventAuditLogSubscriber;
/**
* Defines a method designed to dispatch a message to each implementation
method type
@@ -14,6 +14,6 @@
* an alternate method address if not provided by {@link
event_audit_log_subscriber.getmethod_address()}
* @return the result of the notification send action
*/
- public EventSenderResult send(event_audit_log_subscriber eventData, String
methodAddress);
+ public EventSenderResult send(EventAuditLogSubscriber eventData, String
methodAddress);
}
diff --git
a/backend/manager/tools/engine-notifier/engine-notifier-service/src/main/java/org/ovirt/engine/core/notifier/utils/sender/mail/EventMessageContent.java
b/backend/manager/tools/engine-notifier/engine-notifier-service/src/main/java/org/ovirt/engine/core/notifier/utils/sender/mail/EventMessageContent.java
index 045be46..0f9a290 100644
---
a/backend/manager/tools/engine-notifier/engine-notifier-service/src/main/java/org/ovirt/engine/core/notifier/utils/sender/mail/EventMessageContent.java
+++
b/backend/manager/tools/engine-notifier/engine-notifier-service/src/main/java/org/ovirt/engine/core/notifier/utils/sender/mail/EventMessageContent.java
@@ -1,6 +1,6 @@
package org.ovirt.engine.core.notifier.utils.sender.mail;
-import
org.ovirt.engine.core.common.businessentities.event_audit_log_subscriber;
+import org.ovirt.engine.core.common.businessentities.EventAuditLogSubscriber;
/**
* Creates a simple message subject and body using helper class {@linkplain
MessageHelper} to determine <br>
@@ -10,11 +10,11 @@
private String subject;
private String body;
- private void prepareMessageSubject(String hostName,
event_audit_log_subscriber eventData) {
+ private void prepareMessageSubject(String hostName,
EventAuditLogSubscriber eventData) {
subject =
MessageHelper.prepareMessageSubject(eventData.getevent_type(), hostName,
eventData.getmessage());
}
- private void prepareMessageBody(event_audit_log_subscriber eventData,
boolean isBodyHtml) {
+ private void prepareMessageBody(EventAuditLogSubscriber eventData, boolean
isBodyHtml) {
MessageBody messageBody = new MessageBody();
messageBody.setUserInfo(eventData.getuser_name());
messageBody.setVmInfo(eventData.getvm_name());
@@ -59,7 +59,7 @@
* @param isBodyHtml
* defines the format of message body
*/
- public void prepareMessage(String hostName, event_audit_log_subscriber
eventData, boolean isBodyHtml) {
+ public void prepareMessage(String hostName, EventAuditLogSubscriber
eventData, boolean isBodyHtml) {
prepareMessageSubject(hostName, eventData);
prepareMessageBody(eventData, isBodyHtml);
}
diff --git
a/backend/manager/tools/engine-notifier/engine-notifier-service/src/main/java/org/ovirt/engine/core/notifier/utils/sender/mail/EventSenderMailImpl.java
b/backend/manager/tools/engine-notifier/engine-notifier-service/src/main/java/org/ovirt/engine/core/notifier/utils/sender/mail/EventSenderMailImpl.java
index aa9dc32..7900f7a 100644
---
a/backend/manager/tools/engine-notifier/engine-notifier-service/src/main/java/org/ovirt/engine/core/notifier/utils/sender/mail/EventSenderMailImpl.java
+++
b/backend/manager/tools/engine-notifier/engine-notifier-service/src/main/java/org/ovirt/engine/core/notifier/utils/sender/mail/EventSenderMailImpl.java
@@ -10,7 +10,7 @@
import org.apache.commons.lang.StringUtils;
import org.apache.commons.logging.Log;
import org.apache.commons.logging.LogFactory;
-import
org.ovirt.engine.core.common.businessentities.event_audit_log_subscriber;
+import org.ovirt.engine.core.common.businessentities.EventAuditLogSubscriber;
import org.ovirt.engine.core.notifier.utils.NotificationProperties;
import org.ovirt.engine.core.notifier.utils.sender.EventSender;
import org.ovirt.engine.core.notifier.utils.sender.EventSenderResult;
@@ -53,7 +53,7 @@
/**
* {@link #EventSender}
*/
- public EventSenderResult send(event_audit_log_subscriber eventData, String
methodAddress) {
+ public EventSenderResult send(EventAuditLogSubscriber eventData, String
methodAddress) {
EventSenderResult result = new EventSenderResult();
EventMessageContent message = new EventMessageContent();
message.prepareMessage(hostName, eventData, isBodyHtml);
diff --git
a/backend/manager/tools/engine-notifier/engine-notifier-service/src/test/java/org/ovirt/engine/core/notifier/utils/mail/MailSenderTest.java
b/backend/manager/tools/engine-notifier/engine-notifier-service/src/test/java/org/ovirt/engine/core/notifier/utils/mail/MailSenderTest.java
index 6818fb3..5330a22 100644
---
a/backend/manager/tools/engine-notifier/engine-notifier-service/src/test/java/org/ovirt/engine/core/notifier/utils/mail/MailSenderTest.java
+++
b/backend/manager/tools/engine-notifier/engine-notifier-service/src/test/java/org/ovirt/engine/core/notifier/utils/mail/MailSenderTest.java
@@ -7,7 +7,7 @@
import java.util.Map;
import org.junit.Test;
-import
org.ovirt.engine.core.common.businessentities.event_audit_log_subscriber;
+import org.ovirt.engine.core.common.businessentities.EventAuditLogSubscriber;
import org.ovirt.engine.core.notifier.utils.NotificationProperties;
import org.ovirt.engine.core.notifier.utils.sender.EventSenderResult;
import org.ovirt.engine.core.notifier.utils.sender.mail.EventSenderMailImpl;
@@ -28,7 +28,7 @@
*/
@Test
public void testNonSecuredEventMailSender() {
- event_audit_log_subscriber eventData = new
event_audit_log_subscriber();
+ EventAuditLogSubscriber eventData = new EventAuditLogSubscriber();
eventData.setlog_time(new Date());
eventData.setevent_type(0);
eventData.setuser_name("a test user name");
@@ -61,7 +61,7 @@
*/
@Test
public void testSecuredEventMailSender() {
- event_audit_log_subscriber eventData = new
event_audit_log_subscriber();
+ EventAuditLogSubscriber eventData = new EventAuditLogSubscriber();
eventData.setlog_time(new Date());
eventData.setevent_type(0);
eventData.setuser_name("a test user name");
--
To view, visit http://gerrit.ovirt.org/10051
To unsubscribe, visit http://gerrit.ovirt.org/settings
Gerrit-MessageType: newchange
Gerrit-Change-Id: I2be0dc94e27ca51065bfc9c2db601e595d64509e
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
