From f76fee63ed9cb3a30d3c0c092d860b1cb93a481b Mon Sep 17 00:00:00 2001
From: Gerard Smyth <gerard.smyth@gmail.com>
Date: Thu, 08 May 2014 13:09:30 -0400
Subject: [PATCH] Updated the SyndicationServlet to provide an additional option to return details of the tags in the repository instead of the commits. This uses a new 'ot' request parameter to indicate the object type of the content to return, which can be ither TAG or COMMIT. If this is not provided, then COMMIT is assumed to maintain backwards compatability. If tags are returned, then the paging parameters, 'l' and 'pg' are still supported, but searching options are currently ignored.
---
src/main/java/com/gitblit/manager/NotificationManager.java | 109 ++++++++++++++++--------------------------------------
1 files changed, 33 insertions(+), 76 deletions(-)
diff --git a/src/main/java/com/gitblit/manager/NotificationManager.java b/src/main/java/com/gitblit/manager/NotificationManager.java
index eae563f..ba63cfc 100644
--- a/src/main/java/com/gitblit/manager/NotificationManager.java
+++ b/src/main/java/com/gitblit/manager/NotificationManager.java
@@ -15,24 +15,20 @@
*/
package com.gitblit.manager;
-import java.text.MessageFormat;
import java.util.Collection;
-import java.util.List;
import java.util.concurrent.Executors;
import java.util.concurrent.ScheduledExecutorService;
import java.util.concurrent.TimeUnit;
import javax.mail.Message;
-import javax.mail.MessagingException;
-import javax.mail.internet.MimeBodyPart;
-import javax.mail.internet.MimeMultipart;
import org.slf4j.Logger;
import org.slf4j.LoggerFactory;
import com.gitblit.IStoredSettings;
import com.gitblit.Keys;
-import com.gitblit.MailExecutor;
+import com.gitblit.models.Mailing;
+import com.gitblit.service.MailService;
/**
* The notification manager dispatches notifications. Currently, email is the
@@ -50,26 +46,27 @@
private final IStoredSettings settings;
- private final MailExecutor mailExecutor;
+ private final MailService mailService;
public NotificationManager(IStoredSettings settings) {
this.settings = settings;
- this.mailExecutor = new MailExecutor(settings);
+ this.mailService = new MailService(settings);
}
@Override
- public IManager setup() {
- if (mailExecutor.isReady()) {
- logger.info("Mail executor is scheduled to process the message queue every 2 minutes.");
- scheduledExecutor.scheduleAtFixedRate(mailExecutor, 1, 2, TimeUnit.MINUTES);
+ public NotificationManager start() {
+ if (mailService.isReady()) {
+ int period = 2;
+ logger.info("Mail service will process the queue every {} minutes.", period);
+ scheduledExecutor.scheduleAtFixedRate(mailService, 1, period, TimeUnit.MINUTES);
} else {
- logger.warn("Mail server is not properly configured. Mail services disabled.");
+ logger.warn("Mail service disabled.");
}
return this;
}
@Override
- public IManager stop() {
+ public NotificationManager stop() {
scheduledExecutor.shutdownNow();
return this;
}
@@ -82,8 +79,11 @@
*/
@Override
public void sendMailToAdministrators(String subject, String message) {
- List<String> toAddresses = settings.getStrings(Keys.mail.adminAddresses);
- sendMail(subject, message, toAddresses);
+ Mailing mail = Mailing.newPlain();
+ mail.subject = subject;
+ mail.content = message;
+ mail.setRecipients(settings.getStrings(Keys.mail.adminAddresses));
+ send(mail);
}
/**
@@ -95,41 +95,11 @@
*/
@Override
public void sendMail(String subject, String message, Collection<String> toAddresses) {
- this.sendMail(subject, message, toAddresses.toArray(new String[0]));
- }
-
- /**
- * Notify users by email of something.
- *
- * @param subject
- * @param message
- * @param toAddresses
- */
- @Override
- public void sendMail(String subject, String message, String... toAddresses) {
- if (toAddresses == null || toAddresses.length == 0) {
- logger.debug(MessageFormat.format("Dropping message {0} because there are no recipients", subject));
- return;
- }
- try {
- Message mail = mailExecutor.createMessage(toAddresses);
- if (mail != null) {
- mail.setSubject(subject);
-
- MimeBodyPart messagePart = new MimeBodyPart();
- messagePart.setText(message, "utf-8");
- messagePart.setHeader("Content-Type", "text/plain; charset=\"utf-8\"");
- messagePart.setHeader("Content-Transfer-Encoding", "quoted-printable");
-
- MimeMultipart multiPart = new MimeMultipart();
- multiPart.addBodyPart(messagePart);
- mail.setContent(multiPart);
-
- mailExecutor.queue(mail);
- }
- } catch (MessagingException e) {
- logger.error("Messaging error", e);
- }
+ Mailing mail = Mailing.newPlain();
+ mail.subject = subject;
+ mail.content = message;
+ mail.setRecipients(toAddresses);
+ send(mail);
}
/**
@@ -141,40 +111,27 @@
*/
@Override
public void sendHtmlMail(String subject, String message, Collection<String> toAddresses) {
- this.sendHtmlMail(subject, message, toAddresses.toArray(new String[0]));
+ Mailing mail = Mailing.newHtml();
+ mail.subject = subject;
+ mail.content = message;
+ mail.setRecipients(toAddresses);
+ send(mail);
}
/**
* Notify users by email of something.
*
- * @param subject
- * @param message
- * @param toAddresses
+ * @param mailing
*/
@Override
- public void sendHtmlMail(String subject, String message, String... toAddresses) {
- if (toAddresses == null || toAddresses.length == 0) {
- logger.debug(MessageFormat.format("Dropping message {0} because there are no recipients", subject));
+ public void send(Mailing mailing) {
+ if (!mailing.hasRecipients()) {
+ logger.debug("Dropping message {} because there are no recipients", mailing.subject);
return;
}
- try {
- Message mail = mailExecutor.createMessage(toAddresses);
- if (mail != null) {
- mail.setSubject(subject);
-
- MimeBodyPart messagePart = new MimeBodyPart();
- messagePart.setText(message, "utf-8");
- messagePart.setHeader("Content-Type", "text/html; charset=\"utf-8\"");
- messagePart.setHeader("Content-Transfer-Encoding", "quoted-printable");
-
- MimeMultipart multiPart = new MimeMultipart();
- multiPart.addBodyPart(messagePart);
- mail.setContent(multiPart);
-
- mailExecutor.queue(mail);
- }
- } catch (MessagingException e) {
- logger.error("Messaging error", e);
+ Message msg = mailService.createMessage(mailing);
+ if (msg != null) {
+ mailService.queue(msg);
}
}
--
Gitblit v1.9.1