Improve notification api by introducing the Mailing model

1 files changed, 5 insertions, 33 deletions

diff --git a/src/main/java/com/gitblit/manager/INotificationManager.java b/src/main/java/com/gitblit/manager/INotificationManager.java
index ce5d3f71..6bee2f8e 100644
--- a/src/main/java/com/gitblit/manager/INotificationManager.java
+++ b/src/main/java/com/gitblit/manager/INotificationManager.java
@@ -17,6 +17,8 @@ package com.gitblit.manager;
 
 import java.util.Collection;
 
+import com.gitblit.models.Mailing;
+
 public interface INotificationManager extends IManager {
 
 	/**
@@ -43,44 +45,14 @@ public interface INotificationManager extends IManager {
 	 * @param message
 	 * @param toAddresses
 	 */
-	void sendMail(String subject, String message, String... toAddresses);
-
-	/**
-	 * Notify users by email of something.
-	 *
-	 * @param subject
-	 * @param message
-	 * @param toAddresses
-	 */
 	void sendHtmlMail(String subject, String message, Collection<String> toAddresses);
 
 	/**
 	 * Notify users by email of something.
 	 *
-	 * @param subject
-	 * @param message
-	 * @param toAddresses
-	 */
-	void sendHtmlMail(String subject, String message, String... toAddresses);
-
-	/**
-	 * Notify users by email of something.
-	 *
-	 * @param from
-	 * @param subject
-	 * @param message
-	 * @param toAddresses
-	 */
-	void sendHtmlMail(String from, String subject, String message, Collection<String> toAddresses);
-
-	/**
-	 * Notify users by email of something.
-	 *
-	 * @param from
-	 * @param subject
-	 * @param message
-	 * @param toAddresses
+	 * @param mailing
+	 * @return the mail message object
 	 */
-	void sendHtmlMail(String from, String subject, String message, String... toAddresses);
+	void send(Mailing mailing);
 
 }
\ No newline at end of file