From a502d96a860456ec5e8c96761db70f7cabb74751 Mon Sep 17 00:00:00 2001
From: Paul Martin <paul@paulsputer.com>
Date: Sat, 30 Apr 2016 04:19:14 -0400
Subject: [PATCH] Merge pull request #1073 from gitblit/1062-DocEditorUpdates
---
src/main/java/com/gitblit/manager/INotificationManager.java | 50 +++++++++++++++++---------------------------------
1 files changed, 17 insertions(+), 33 deletions(-)
diff --git a/src/main/java/com/gitblit/manager/INotificationManager.java b/src/main/java/com/gitblit/manager/INotificationManager.java
index ce5d3f7..64fc01e 100644
--- a/src/main/java/com/gitblit/manager/INotificationManager.java
+++ b/src/main/java/com/gitblit/manager/INotificationManager.java
@@ -17,13 +17,24 @@
import java.util.Collection;
+import com.gitblit.models.Mailing;
+
public interface INotificationManager extends IManager {
+
+ /**
+ * Returns true if the email service is configured and ready to send notifications.
+ *
+ * @return true if the email service is operational
+ * @since 1.6.0
+ */
+ boolean isSendingMail();
/**
* Notify the administrators by email.
*
* @param subject
* @param message
+ * @since 1.4.0
*/
void sendMailToAdministrators(String subject, String message);
@@ -33,6 +44,7 @@
* @param subject
* @param message
* @param toAddresses
+ * @since 1.4.0
*/
void sendMail(String subject, String message, Collection<String> toAddresses);
@@ -42,45 +54,17 @@
* @param subject
* @param message
* @param toAddresses
- */
- void sendMail(String subject, String message, String... toAddresses);
-
- /**
- * Notify users by email of something.
- *
- * @param subject
- * @param message
- * @param toAddresses
+ * @since 1.4.0
*/
void sendHtmlMail(String subject, String message, Collection<String> toAddresses);
/**
* Notify users by email of something.
*
- * @param subject
- * @param message
- * @param toAddresses
+ * @param mailing
+ * @return the mail message object
+ * @since 1.4.0
*/
- 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
- */
- void sendHtmlMail(String from, String subject, String message, String... toAddresses);
+ void send(Mailing mailing);
}
\ No newline at end of file
--
Gitblit v1.9.1