mooli tayer has uploaded a new change for review.
Change subject: tools: reorganize packages
......................................................................
tools: reorganize packages
Change-Id: Ic8ad76f4fdc9d065eaa8380fba68a2a86f8410fa
Signed-off-by: Mooli Tayer <mta...@redhat.com>
---
R
backend/manager/tools/src/main/java/org/ovirt/engine/core/notifier/NotificationMethodsMapper.java
M
backend/manager/tools/src/main/java/org/ovirt/engine/core/notifier/NotificationService.java
M
backend/manager/tools/src/main/java/org/ovirt/engine/core/notifier/dao/EventsManager.java
A
backend/manager/tools/src/main/java/org/ovirt/engine/core/notifier/sender/EventSender.java
R
backend/manager/tools/src/main/java/org/ovirt/engine/core/notifier/sender/EventSenderResult.java
R
backend/manager/tools/src/main/java/org/ovirt/engine/core/notifier/sender/mail/EventMailSender.java
R
backend/manager/tools/src/main/java/org/ovirt/engine/core/notifier/sender/mail/EventMessageContent.java
R
backend/manager/tools/src/main/java/org/ovirt/engine/core/notifier/sender/mail/JavaMailSender.java
R
backend/manager/tools/src/main/java/org/ovirt/engine/core/notifier/sender/mail/MessageBody.java
R
backend/manager/tools/src/main/java/org/ovirt/engine/core/notifier/sender/mail/MessageHelper.java
D
backend/manager/tools/src/main/java/org/ovirt/engine/core/notifier/utils/sender/EventSender.java
M
backend/manager/tools/src/test/java/org/ovirt/engine/core/notifier/utils/mail/MailSenderTest.java
12 files changed, 29 insertions(+), 33 deletions(-)
git pull ssh://gerrit.ovirt.org:29418/ovirt-engine refs/changes/53/23153/1
diff --git
a/backend/manager/tools/src/main/java/org/ovirt/engine/core/notifier/utils/NotificationMethodsMapper.java
b/backend/manager/tools/src/main/java/org/ovirt/engine/core/notifier/NotificationMethodsMapper.java
similarity index 66%
rename from
backend/manager/tools/src/main/java/org/ovirt/engine/core/notifier/utils/NotificationMethodsMapper.java
rename to
backend/manager/tools/src/main/java/org/ovirt/engine/core/notifier/NotificationMethodsMapper.java
index 26ce6a7..ca5bf8d 100644
---
a/backend/manager/tools/src/main/java/org/ovirt/engine/core/notifier/utils/NotificationMethodsMapper.java
+++
b/backend/manager/tools/src/main/java/org/ovirt/engine/core/notifier/NotificationMethodsMapper.java
@@ -1,8 +1,9 @@
-package org.ovirt.engine.core.notifier.utils;
+package org.ovirt.engine.core.notifier;
import org.ovirt.engine.core.common.EventNotificationMethod;
-import org.ovirt.engine.core.notifier.utils.sender.EventSender;
-import org.ovirt.engine.core.notifier.utils.sender.mail.EventSenderMailImpl;
+import org.ovirt.engine.core.notifier.sender.EventSender;
+import org.ovirt.engine.core.notifier.sender.mail.EventMailSender;
+import org.ovirt.engine.core.notifier.utils.NotificationProperties;
import java.util.HashMap;
import java.util.Map;
@@ -12,7 +13,7 @@
private Map<EventNotificationMethod, EventSender> eventSenders = new
HashMap<>();
public NotificationMethodsMapper(NotificationProperties prop) {
- eventSenders.put(EventNotificationMethod.EMAIL, new
EventSenderMailImpl(prop));
+ eventSenders.put(EventNotificationMethod.EMAIL, new
EventMailSender(prop));
}
public EventSender getEventSender(EventNotificationMethod method) {
diff --git
a/backend/manager/tools/src/main/java/org/ovirt/engine/core/notifier/NotificationService.java
b/backend/manager/tools/src/main/java/org/ovirt/engine/core/notifier/NotificationService.java
index 97d10b2..e157396 100644
---
a/backend/manager/tools/src/main/java/org/ovirt/engine/core/notifier/NotificationService.java
+++
b/backend/manager/tools/src/main/java/org/ovirt/engine/core/notifier/NotificationService.java
@@ -15,9 +15,8 @@
import org.ovirt.engine.core.notifier.dao.EventsManager;
import org.ovirt.engine.core.notifier.utils.NotificationMethodsMapper;
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;
+import org.ovirt.engine.core.notifier.sender.*;
/**
* Responsible for an execution of the service for the current events in the
system which should be notified to the
* subscribers.
@@ -95,10 +94,10 @@
private void distributeEvent(List<AuditLogEventSubscriber>
eventSubscribers, AuditLogEvent event) throws SQLException {
for (AuditLogEventSubscriber subscriber : eventSubscribers) {
if (subscriber.isSubscribed(event)) {
- EventSender method =
notificationMethodsMapper.getEventSender(subscriber.getEventNotificationMethod());
+ EventSender sender =
notificationMethodsMapper.getEventSender(subscriber.getEventNotificationMethod());
EventSenderResult sendResult;
try {
- sendResult = method.send(event, subscriber);
+ sendResult = sender.send(event, subscriber);
} catch (Exception e) {
log.error("Failed to dispatch message", e);
sendResult = new EventSenderResult();
diff --git
a/backend/manager/tools/src/main/java/org/ovirt/engine/core/notifier/dao/EventsManager.java
b/backend/manager/tools/src/main/java/org/ovirt/engine/core/notifier/dao/EventsManager.java
index 3ca62ea..cee66ae 100644
---
a/backend/manager/tools/src/main/java/org/ovirt/engine/core/notifier/dao/EventsManager.java
+++
b/backend/manager/tools/src/main/java/org/ovirt/engine/core/notifier/dao/EventsManager.java
@@ -10,7 +10,7 @@
import org.ovirt.engine.core.common.businessentities.UPDownEventFilter;
import org.ovirt.engine.core.compat.Guid;
import org.ovirt.engine.core.notifier.NotificationServiceException;
-import org.ovirt.engine.core.notifier.utils.sender.EventSenderResult;
+import org.ovirt.engine.core.notifier.sender.EventSenderResult;
import org.ovirt.engine.core.tools.common.db.StandaloneDataSource;
import org.ovirt.engine.core.utils.db.DbUtils;
diff --git
a/backend/manager/tools/src/main/java/org/ovirt/engine/core/notifier/sender/EventSender.java
b/backend/manager/tools/src/main/java/org/ovirt/engine/core/notifier/sender/EventSender.java
new file mode 100644
index 0000000..ec44fe4
--- /dev/null
+++
b/backend/manager/tools/src/main/java/org/ovirt/engine/core/notifier/sender/EventSender.java
@@ -0,0 +1,10 @@
+package org.ovirt.engine.core.notifier.sender;
+
+import org.ovirt.engine.core.common.businessentities.AuditLogEvent;
+import org.ovirt.engine.core.common.businessentities.AuditLogEventSubscriber;
+
+public interface EventSender {
+
+ public EventSenderResult send(AuditLogEvent auditLogEvent,
AuditLogEventSubscriber AuditLogEventSubscriber);
+
+}
\ No newline at end of file
diff --git
a/backend/manager/tools/src/main/java/org/ovirt/engine/core/notifier/utils/sender/EventSenderResult.java
b/backend/manager/tools/src/main/java/org/ovirt/engine/core/notifier/sender/EventSenderResult.java
similarity index 95%
rename from
backend/manager/tools/src/main/java/org/ovirt/engine/core/notifier/utils/sender/EventSenderResult.java
rename to
backend/manager/tools/src/main/java/org/ovirt/engine/core/notifier/sender/EventSenderResult.java
index f3df3ac..ba41dec 100644
---
a/backend/manager/tools/src/main/java/org/ovirt/engine/core/notifier/utils/sender/EventSenderResult.java
+++
b/backend/manager/tools/src/main/java/org/ovirt/engine/core/notifier/sender/EventSenderResult.java
@@ -1,4 +1,4 @@
-package org.ovirt.engine.core.notifier.utils.sender;
+package org.ovirt.engine.core.notifier.sender;
/**
* Describes the result of send attempt.
@@ -47,4 +47,4 @@
public void setSent(boolean isSent) {
this.isSent = isSent;
}
-}
+}
\ No newline at end of file
diff --git
a/backend/manager/tools/src/main/java/org/ovirt/engine/core/notifier/utils/sender/mail/EventMailSender.java
b/backend/manager/tools/src/main/java/org/ovirt/engine/core/notifier/sender/mail/EventMailSender.java
similarity index 95%
rename from
backend/manager/tools/src/main/java/org/ovirt/engine/core/notifier/utils/sender/mail/EventMailSender.java
rename to
backend/manager/tools/src/main/java/org/ovirt/engine/core/notifier/sender/mail/EventMailSender.java
index a6ebf2b..1646a12 100644
---
a/backend/manager/tools/src/main/java/org/ovirt/engine/core/notifier/utils/sender/mail/EventMailSender.java
+++
b/backend/manager/tools/src/main/java/org/ovirt/engine/core/notifier/sender/mail/EventMailSender.java
@@ -1,4 +1,4 @@
-package org.ovirt.engine.core.notifier.utils.sender.mail;
+package org.ovirt.engine.core.notifier.sender.mail;
import java.net.InetAddress;
@@ -10,9 +10,9 @@
import org.apache.log4j.Logger;
import org.ovirt.engine.core.common.businessentities.AuditLogEvent;
import org.ovirt.engine.core.common.businessentities.AuditLogEventSubscriber;
+import org.ovirt.engine.core.notifier.sender.EventSender;
+import org.ovirt.engine.core.notifier.sender.EventSenderResult;
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;
/**
* The class sends e-mails to event subscribers.
diff --git
a/backend/manager/tools/src/main/java/org/ovirt/engine/core/notifier/utils/sender/mail/EventMessageContent.java
b/backend/manager/tools/src/main/java/org/ovirt/engine/core/notifier/sender/mail/EventMessageContent.java
similarity index 97%
rename from
backend/manager/tools/src/main/java/org/ovirt/engine/core/notifier/utils/sender/mail/EventMessageContent.java
rename to
backend/manager/tools/src/main/java/org/ovirt/engine/core/notifier/sender/mail/EventMessageContent.java
index 96bb5a5..2df4c15 100644
---
a/backend/manager/tools/src/main/java/org/ovirt/engine/core/notifier/utils/sender/mail/EventMessageContent.java
+++
b/backend/manager/tools/src/main/java/org/ovirt/engine/core/notifier/sender/mail/EventMessageContent.java
@@ -1,4 +1,4 @@
-package org.ovirt.engine.core.notifier.utils.sender.mail;
+package org.ovirt.engine.core.notifier.sender.mail;
import org.ovirt.engine.core.common.businessentities.AuditLogEvent;
diff --git
a/backend/manager/tools/src/main/java/org/ovirt/engine/core/notifier/utils/sender/mail/JavaMailSender.java
b/backend/manager/tools/src/main/java/org/ovirt/engine/core/notifier/sender/mail/JavaMailSender.java
similarity index 98%
rename from
backend/manager/tools/src/main/java/org/ovirt/engine/core/notifier/utils/sender/mail/JavaMailSender.java
rename to
backend/manager/tools/src/main/java/org/ovirt/engine/core/notifier/sender/mail/JavaMailSender.java
index 295e9c2..a9ea4c5 100644
---
a/backend/manager/tools/src/main/java/org/ovirt/engine/core/notifier/utils/sender/mail/JavaMailSender.java
+++
b/backend/manager/tools/src/main/java/org/ovirt/engine/core/notifier/sender/mail/JavaMailSender.java
@@ -1,4 +1,4 @@
-package org.ovirt.engine.core.notifier.utils.sender.mail;
+package org.ovirt.engine.core.notifier.sender.mail;
import java.util.Date;
import java.util.Properties;
diff --git
a/backend/manager/tools/src/main/java/org/ovirt/engine/core/notifier/utils/sender/mail/MessageBody.java
b/backend/manager/tools/src/main/java/org/ovirt/engine/core/notifier/sender/mail/MessageBody.java
similarity index 96%
rename from
backend/manager/tools/src/main/java/org/ovirt/engine/core/notifier/utils/sender/mail/MessageBody.java
rename to
backend/manager/tools/src/main/java/org/ovirt/engine/core/notifier/sender/mail/MessageBody.java
index 80456b6..e5db11a 100644
---
a/backend/manager/tools/src/main/java/org/ovirt/engine/core/notifier/utils/sender/mail/MessageBody.java
+++
b/backend/manager/tools/src/main/java/org/ovirt/engine/core/notifier/sender/mail/MessageBody.java
@@ -1,4 +1,4 @@
-package org.ovirt.engine.core.notifier.utils.sender.mail;
+package org.ovirt.engine.core.notifier.sender.mail;
/**
* Describes a message content
diff --git
a/backend/manager/tools/src/main/java/org/ovirt/engine/core/notifier/utils/sender/mail/MessageHelper.java
b/backend/manager/tools/src/main/java/org/ovirt/engine/core/notifier/sender/mail/MessageHelper.java
similarity index 98%
rename from
backend/manager/tools/src/main/java/org/ovirt/engine/core/notifier/utils/sender/mail/MessageHelper.java
rename to
backend/manager/tools/src/main/java/org/ovirt/engine/core/notifier/sender/mail/MessageHelper.java
index 2c77abb..1807675 100644
---
a/backend/manager/tools/src/main/java/org/ovirt/engine/core/notifier/utils/sender/mail/MessageHelper.java
+++
b/backend/manager/tools/src/main/java/org/ovirt/engine/core/notifier/sender/mail/MessageHelper.java
@@ -1,4 +1,4 @@
-package org.ovirt.engine.core.notifier.utils.sender.mail;
+package org.ovirt.engine.core.notifier.sender.mail;
import org.apache.commons.lang.StringUtils;
import org.ovirt.engine.core.common.businessentities.AuditLogEventType;
diff --git
a/backend/manager/tools/src/main/java/org/ovirt/engine/core/notifier/utils/sender/EventSender.java
b/backend/manager/tools/src/main/java/org/ovirt/engine/core/notifier/utils/sender/EventSender.java
deleted file mode 100644
index d806631..0000000
---
a/backend/manager/tools/src/main/java/org/ovirt/engine/core/notifier/utils/sender/EventSender.java
+++ /dev/null
@@ -1,14 +0,0 @@
-package org.ovirt.engine.core.notifier.utils.sender;
-
-import org.ovirt.engine.core.common.businessentities.AuditLogEvent;
-import org.ovirt.engine.core.common.businessentities.AuditLogEventSubscriber;
-import org.ovirt.engine.core.common.businessentities.EventAuditLogSubscriber;
-
-/**
- * Defines a method designed to dispatch a message to each implementation
method type
- */
-public interface EventSender {
-
- public EventSenderResult send(AuditLogEvent auditLogEvent,
AuditLogEventSubscriber AuditLogEventSubscriber);
-
-}
diff --git
a/backend/manager/tools/src/test/java/org/ovirt/engine/core/notifier/utils/mail/MailSenderTest.java
b/backend/manager/tools/src/test/java/org/ovirt/engine/core/notifier/utils/mail/MailSenderTest.java
index ba069b9..8d8f7e4 100644
---
a/backend/manager/tools/src/test/java/org/ovirt/engine/core/notifier/utils/mail/MailSenderTest.java
+++
b/backend/manager/tools/src/test/java/org/ovirt/engine/core/notifier/utils/mail/MailSenderTest.java
@@ -15,7 +15,7 @@
import org.ovirt.engine.core.common.businessentities.AuditLogEventSubscriber;
import org.ovirt.engine.core.common.businessentities.AuditLogEventType;
import org.ovirt.engine.core.notifier.utils.NotificationProperties;
-import org.ovirt.engine.core.notifier.utils.sender.EventSenderResult;
+import org.ovirt.engine.core.notifier.sender.EventSenderResult;
/**
* A tester of the {@link JavaMailSender}. Tests both secured and non-secured
methods of mail sending as SMTP and SMTP
--
To view, visit http://gerrit.ovirt.org/23153
To unsubscribe, visit http://gerrit.ovirt.org/settings
Gerrit-MessageType: newchange
Gerrit-Change-Id: Ic8ad76f4fdc9d065eaa8380fba68a2a86f8410fa
Gerrit-PatchSet: 1
Gerrit-Project: ovirt-engine
Gerrit-Branch: master
Gerrit-Owner: mooli tayer <mta...@redhat.com>
_______________________________________________
Engine-patches mailing list
Engine-patches@ovirt.org
http://lists.ovirt.org/mailman/listinfo/engine-patches
