Skip to content

The Unified and Autonomous Development Platform

Modify MailManager to accept email list instead of user list to avoid LazyLoadException when called in async mode

robin shinefbfb7d850582
diff --git a/gitplex.core/src/main/java/com/gitplex/core/manager/MailManager.java b/gitplex.core/src/main/java/com/gitplex/core/manager/MailManager.java
index 2f11592f1f..f5d3894fe5 100644
--- a/gitplex.core/src/main/java/com/gitplex/core/manager/MailManager.java
+++ b/gitplex.core/src/main/java/com/gitplex/core/manager/MailManager.java
@@ -2,15 +2,14 @@ package com.gitplex.core.manager;
import java.util.Collection;
-import com.gitplex.core.entity.Account;
import com.gitplex.core.setting.MailSetting;
public interface MailManager {
- void sendMail(Collection<Account> toList, String subject, String body);
+ void sendMail(Collection<String> toList, String subject, String body);
- void sendMail(MailSetting mailSetting, Collection<Account> toList, String subject, String body);
+ void sendMail(MailSetting mailSetting, Collection<String> toList, String subject, String body);
- void sendMailAsync(Collection<Account> toList, String subject, String body);
+ void sendMailAsync(Collection<String> toList, String subject, String body);
}
diff --git a/gitplex.core/src/main/java/com/gitplex/core/manager/impl/DefaultCodeCommentManager.java b/gitplex.core/src/main/java/com/gitplex/core/manager/impl/DefaultCodeCommentManager.java
index 86cf762ec5..16a54710c2 100644
--- a/gitplex.core/src/main/java/com/gitplex/core/manager/impl/DefaultCodeCommentManager.java
+++ b/gitplex.core/src/main/java/com/gitplex/core/manager/impl/DefaultCodeCommentManager.java
@@ -203,7 +203,8 @@ public class DefaultCodeCommentManager extends AbstractEntityManager<CodeComment
+ "For details, please visit <a href='%s'>%s</a>",
markdownManager.escape(event.getMarkdown()), url, url);
- mailManager.sendMailAsync(mentionedUsers, subject, decorateBody(subject + "." + content));
+ mailManager.sendMailAsync(mentionedUsers.stream().map(Account::getEmail).collect(Collectors.toList()),
+ subject, decorateBody(subject + "." + content));
Collection<Account> involvedUsers = new HashSet<>();
RevCommit commit = comment.getDepot().getRevCommit(ObjectId.fromString(comment.getCommentPos().getCommit()));
@@ -216,8 +217,9 @@ public class DefaultCodeCommentManager extends AbstractEntityManager<CodeComment
involvedUsers.removeAll(mentionedUsers);
involvedUsers.remove(event.getUser());
- subject = "You are involved in a code comment on file " + comment.getCommentPos().getPath();
- mailManager.sendMailAsync(involvedUsers, subject, decorateBody(subject + "." + content));
+ subject = "You are involved in a code comment on file " + comment.getCommentPos().getPath();
+ mailManager.sendMailAsync(involvedUsers.stream().map(Account::getEmail).collect(Collectors.toList()),
+ subject, decorateBody(subject + "." + content));
}
}
diff --git a/gitplex.core/src/main/java/com/gitplex/core/manager/impl/DefaultDataManager.java b/gitplex.core/src/main/java/com/gitplex/core/manager/impl/DefaultDataManager.java
index 96ea3dc882..1a5df225bd 100644
--- a/gitplex.core/src/main/java/com/gitplex/core/manager/impl/DefaultDataManager.java
+++ b/gitplex.core/src/main/java/com/gitplex/core/manager/impl/DefaultDataManager.java
@@ -247,7 +247,7 @@ public class DefaultDataManager implements DataManager, Serializable {
+ "<p style='margin: 16px 0;'>"
+ "-- Sent by GitPlex",
url, url, Throwables.getStackTraceAsString(e));
- mailManager.sendMail(Lists.newArrayList(root), "GitPlex database auto-backup failed", body);
+ mailManager.sendMail(Lists.newArrayList(root.getEmail()), "GitPlex database auto-backup failed", body);
}
public Object writeReplace() throws ObjectStreamException {
diff --git a/gitplex.core/src/main/java/com/gitplex/core/manager/impl/DefaultMailManager.java b/gitplex.core/src/main/java/com/gitplex/core/manager/impl/DefaultMailManager.java
index 306d579a78..2f475304ab 100644
--- a/gitplex.core/src/main/java/com/gitplex/core/manager/impl/DefaultMailManager.java
+++ b/gitplex.core/src/main/java/com/gitplex/core/manager/impl/DefaultMailManager.java
@@ -2,7 +2,6 @@ package com.gitplex.core.manager.impl;
import java.net.InetAddress;
import java.net.UnknownHostException;
-import java.util.ArrayList;
import java.util.Collection;
import java.util.concurrent.ExecutorService;
@@ -16,13 +15,12 @@ import org.hibernate.resource.transaction.spi.TransactionStatus;
import org.slf4j.Logger;
import org.slf4j.LoggerFactory;
-import com.gitplex.core.entity.Account;
-import com.gitplex.core.manager.ConfigManager;
-import com.gitplex.core.manager.MailManager;
-import com.gitplex.core.setting.MailSetting;
import com.gitplex.commons.bootstrap.Bootstrap;
import com.gitplex.commons.hibernate.Sessional;
import com.gitplex.commons.hibernate.dao.Dao;
+import com.gitplex.core.manager.ConfigManager;
+import com.gitplex.core.manager.MailManager;
+import com.gitplex.core.setting.MailSetting;
@Singleton
public class DefaultMailManager implements MailManager {
@@ -44,7 +42,7 @@ public class DefaultMailManager implements MailManager {
@Sessional
@Override
- public void sendMailAsync(Collection<Account> toList, String subject, String body) {
+ public void sendMailAsync(Collection<String> toList, String subject, String body) {
if (dao.getSession().getTransaction().getStatus() == TransactionStatus.ACTIVE) {
dao.doAsyncAfterCommit(newSendMailRunnable(toList, subject, body));
} else {
@@ -52,7 +50,7 @@ public class DefaultMailManager implements MailManager {
}
}
- private Runnable newSendMailRunnable(Collection<Account> toList, String subject, String body) {
+ private Runnable newSendMailRunnable(Collection<String> toList, String subject, String body) {
return new Runnable() {
@Override
@@ -68,14 +66,8 @@ public class DefaultMailManager implements MailManager {
}
@Override
- public void sendMail(MailSetting mailSetting, Collection<Account> toList, String subject, String body) {
- Collection<String> toAddresses = new ArrayList<>();
- for (Account user: toList) {
- if (user.getEmail() != null)
- toAddresses.add(user.getEmail());
- }
-
- if (toAddresses.isEmpty())
+ public void sendMail(MailSetting mailSetting, Collection<String> toList, String subject, String body) {
+ if (toList.isEmpty())
return;
if (mailSetting == null)
@@ -106,7 +98,7 @@ public class DefaultMailManager implements MailManager {
}
try {
email.setFrom(senderEmail);
- for (String address: toAddresses)
+ for (String address: toList)
email.addTo(address);
email.setHostName(mailSetting.getSmtpHost());
@@ -120,7 +112,7 @@ public class DefaultMailManager implements MailManager {
email.setSubject(subject);
email.setHtmlMsg(body);
- logger.debug("Sending email (to: {}, subject: {})... ", toAddresses, subject);
+ logger.debug("Sending email (to: {}, subject: {})... ", toList, subject);
email.send();
} catch (EmailException e) {
throw new RuntimeException(e);
@@ -128,7 +120,7 @@ public class DefaultMailManager implements MailManager {
}
@Override
- public void sendMail(Collection<Account> toList, String subject, String body) {
+ public void sendMail(Collection<String> toList, String subject, String body) {
sendMail(configManager.getMailSetting(), toList, subject, body);
}
diff --git a/gitplex.core/src/main/java/com/gitplex/core/manager/impl/DefaultPullRequestTaskManager.java b/gitplex.core/src/main/java/com/gitplex/core/manager/impl/DefaultPullRequestTaskManager.java
index ed56994c28..4620ad8c0f 100644
--- a/gitplex.core/src/main/java/com/gitplex/core/manager/impl/DefaultPullRequestTaskManager.java
+++ b/gitplex.core/src/main/java/com/gitplex/core/manager/impl/DefaultPullRequestTaskManager.java
@@ -102,7 +102,7 @@ public class DefaultPullRequestTaskManager extends AbstractEntityManager<PullReq
String body = String.format("You are designated to review pull request #%d (%s).<br>"
+ "Please visit <a href='%s'>%s</a> to do the review.",
request.getNumber(), request.getTitle(), url, url);
- mailManager.sendMailAsync(Sets.newHashSet(task.getUser()), subject, decorate(user, body));
+ mailManager.sendMailAsync(Sets.newHashSet(task.getUser().getEmail()), subject, decorate(user, body));
listenerRegistry.post(new TaskChangeEvent(user));
}
@@ -113,7 +113,7 @@ public class DefaultPullRequestTaskManager extends AbstractEntityManager<PullReq
String body = String.format("You are invited to review pull request #%d (%s).<br>"
+ "Please visit <a href='%s'>%s</a> to do the review.",
request.getNumber(), request.getTitle(), url, url);
- mailManager.sendMailAsync(Sets.newHashSet(invitation.getUser()), subject, decorate(user, body));
+ mailManager.sendMailAsync(Sets.newHashSet(invitation.getUser().getEmail()), subject, decorate(user, body));
}
}
@@ -157,7 +157,7 @@ public class DefaultPullRequestTaskManager extends AbstractEntityManager<PullReq
+ "Please visit <a href='%s'>%s</a> to check and integrate.",
request.getNumber(), request.getTitle(), url, url);
- mailManager.sendMailAsync(Sets.newHashSet(task.getUser()), subject, decorate(user, body));
+ mailManager.sendMailAsync(Sets.newHashSet(task.getUser().getEmail()), subject, decorate(user, body));
listenerRegistry.post(new TaskChangeEvent(user));
}
}
@@ -190,7 +190,7 @@ public class DefaultPullRequestTaskManager extends AbstractEntityManager<PullReq
String body = String.format("Next commits are expected for next round of review in pull request #%d (%s).<br>"
+ "Please visit <a href='%s'>%s</a> for details",
request.getNumber(), request.getTitle(), url, url);
- mailManager.sendMailAsync(Sets.newHashSet(request.getSubmitter()), subject,
+ mailManager.sendMailAsync(Sets.newHashSet(request.getSubmitter().getEmail()), subject,
decorate(request.getSubmitter(), body));
listenerRegistry.post(new TaskChangeEvent(request.getSubmitter()));
}
diff --git a/gitplex.core/src/main/java/com/gitplex/core/manager/impl/DefaultPullRequestWatchManager.java b/gitplex.core/src/main/java/com/gitplex/core/manager/impl/DefaultPullRequestWatchManager.java
index 61b4260a64..59527e1839 100644
--- a/gitplex.core/src/main/java/com/gitplex/core/manager/impl/DefaultPullRequestWatchManager.java
+++ b/gitplex.core/src/main/java/com/gitplex/core/manager/impl/DefaultPullRequestWatchManager.java
@@ -4,6 +4,7 @@ import java.util.Collection;
import java.util.Date;
import java.util.HashSet;
import java.util.Set;
+import java.util.stream.Collectors;
import javax.inject.Inject;
import javax.inject.Singleton;
@@ -149,7 +150,8 @@ public class DefaultPullRequestWatchManager extends AbstractEntityManager<PullRe
+ "For details, please visit <a href='%s'>%s</a>",
subject, markdownManager.escape(markdown), url, url);
- mailManager.sendMailAsync(mentionUsers, subject, decorateBody(body));
+ mailManager.sendMailAsync(mentionUsers.stream().map(Account::getEmail).collect(Collectors.toList()),
+ subject, decorateBody(body));
}
}
@@ -184,7 +186,7 @@ public class DefaultPullRequestWatchManager extends AbstractEntityManager<PullRe
String body = String.format("You are assigned with pull request #%d (%s).<br>"
+ "Please visit <a href='%s'>%s</a> for details.",
request.getNumber(), request.getTitle(), url, url);
- mailManager.sendMailAsync(Sets.newHashSet(request.getAssignee()), subject, decorateBody(body));
+ mailManager.sendMailAsync(Sets.newHashSet(request.getAssignee().getEmail()), subject, decorateBody(body));
}
if (!watchUsers.isEmpty()) {
@@ -211,7 +213,7 @@ public class DefaultPullRequestWatchManager extends AbstractEntityManager<PullRe
+ "You receive this email as you are watching the pull request.",
request.getNumber(), request.getTitle(), eventType, url, url);
}
- mailManager.sendMailAsync(watchUsers, subject, body);
+ mailManager.sendMailAsync(watchUsers.stream().map(Account::getEmail).collect(Collectors.toList()), subject, body);
}
}
diff --git a/gitplex.web/src/main/java/com/gitplex/web/page/admin/MailSettingPage.java b/gitplex.web/src/main/java/com/gitplex/web/page/admin/MailSettingPage.java
index 6f79eee83e..da2b7acde4 100644
--- a/gitplex.web/src/main/java/com/gitplex/web/page/admin/MailSettingPage.java
+++ b/gitplex.web/src/main/java/com/gitplex/web/page/admin/MailSettingPage.java
@@ -64,7 +64,7 @@ public class MailSettingPage extends AdministrationPage {
Account currentUser = GitPlex.getInstance(AccountManager.class).getCurrent();
try {
GitPlex.getInstance(MailManager.class).sendMail(mailSettingHolder.getMailSetting(),
- Sets.newHashSet(currentUser),
+ Sets.newHashSet(currentUser.getEmail()),
"Test email from GitPlex", "Great, your mail setting is correct!");
return new TestResult.Successful("Test mail has been sent to " +
currentUser.getEmail() + ", please check your mail box.");
diff --git a/gitplex.web/src/main/java/com/gitplex/web/page/security/ForgetPage.java b/gitplex.web/src/main/java/com/gitplex/web/page/security/ForgetPage.java
index 7dbc81873f..5fc287a64a 100644
--- a/gitplex.web/src/main/java/com/gitplex/web/page/security/ForgetPage.java
+++ b/gitplex.web/src/main/java/com/gitplex/web/page/security/ForgetPage.java
@@ -76,7 +76,7 @@ public class ForgetPage extends BasePage {
+ "-- Sent by GitPlex",
user.getDisplayName(), user.getName(), password);
- mailManager.sendMail(configManager.getMailSetting(), Arrays.asList(user),
+ mailManager.sendMail(configManager.getMailSetting(), Arrays.asList(user.getEmail()),
"Your GitPlex password has been reset", mailBody);
return new TestResult.Successful("Please check your email " + user.getEmail() + " for the reset password.");
} catch (Exception e) {