Use default sender in issue emails #7437

modules/rest/src/main/java/com/enonic/xp/app/contentstudio/rest/resource/issue/IssueCommentedMailMessageGenerator.java

@@ -29,14 +29,14 @@ protected String getSender()
  }
 
  @Override
- protected String generateRecipients()
+ protected Set<String> generateRecipients()
  {
  final String creatorEmail = super.getCreatorEmail();
  final String modifierEmail = params.getModifier().getEmail();
  final Set<String> emails = getApproverEmails();
  emails.add( creatorEmail );
  filterEmail( emails, modifierEmail );
 
- return String.join( ",", emails );
+ return emails;
  }
 }

modules/rest/src/main/java/com/enonic/xp/app/contentstudio/rest/resource/issue/IssueCreatedMailMessageGenerator.java

@@ -33,7 +33,7 @@ protected String getSender()
 
 
  @Override
- protected String generateRecipients()
+ protected Set<String> generateRecipients()
  {
  final Issue issue = params.getIssue();
  final boolean isNew = issue.getModifiedTime() == null || issue.getModifiedTime().equals( issue.getCreatedTime() );
@@ -44,6 +44,6 @@ protected String generateRecipients()
  {
  filterEmail( emails, creatorEmail );
  }
- return String.join( ",", emails );
+ return emails;
  }
 }

modules/rest/src/main/java/com/enonic/xp/app/contentstudio/rest/resource/issue/IssueMailMessageGenerator.java

@@ -15,17 +15,14 @@
 import java.util.function.Predicate;
 import java.util.stream.Collectors;
 
-import javax.mail.Message;
-import javax.mail.internet.InternetAddress;
-
 import com.google.common.html.HtmlEscapers;
 
 import com.enonic.xp.context.ContextAccessor;
 import com.enonic.xp.core.internal.Interpolator;
 import com.enonic.xp.issue.IssueComment;
 import com.enonic.xp.issue.IssueStatus;
 import com.enonic.xp.issue.IssueType;
-import com.enonic.xp.mail.MailMessage;
+import com.enonic.xp.mail.SendMailParams;
 import com.enonic.xp.project.ProjectName;
 import com.enonic.xp.security.User;
 
@@ -38,24 +35,25 @@ public IssueMailMessageGenerator( final P params )
  this.params = params;
  }
 
- public MailMessage generateMessage()
+ public SendMailParams generateMessage(final String defaultFromEmail)
  {
- final String sender = getSender();
+ final String sender = defaultFromEmail != null ? defaultFromEmail : getSender();
  final String messageSubject = generateMessageSubject();
  final String messageBody = generateMessageBody();
- final String recipients = generateRecipients();
+ final Set<String> recipients = generateRecipients();
 
- if ( recipients.isBlank() )
+ if ( recipients.isEmpty() )
  {
  return null;
  }
 
- return msg -> {
- msg.setFrom( new InternetAddress( sender, "Content Studio" ) );
- msg.addRecipients( Message.RecipientType.TO, recipients );
- msg.setSubject( messageSubject );
- msg.setContent( messageBody, "text/html; charset=UTF-8" );
- };
+ return SendMailParams.create()
+ .from( String.format( "Content Studio <%s>", sender ) )
+ .to( recipients )
+ .subject( messageSubject )
+ .body( messageBody )
+ .contentType( "text/html; charset=UTF-8" )
+ .build();
  }
 
  protected abstract String generateMessageSubject();
@@ -64,9 +62,9 @@ public MailMessage generateMessage()
 
  protected abstract String getSender();
 
- protected String generateRecipients()
+ protected Set<String> generateRecipients()
  {
- return String.join( ",", this.getApproverEmails() );
+ return this.getApproverEmails();
  }
 
  protected boolean shouldShowComments()

modules/rest/src/main/java/com/enonic/xp/app/contentstudio/rest/resource/issue/IssueNotificationsSenderImpl.java

@@ -1,39 +1,34 @@
 package com.enonic.xp.app.contentstudio.rest.resource.issue;
 
-import java.util.concurrent.Executor;
-
 import org.osgi.service.component.annotations.Activate;
 import org.osgi.service.component.annotations.Component;
 import org.osgi.service.component.annotations.Reference;
 
-import com.enonic.xp.mail.MailMessage;
 import com.enonic.xp.mail.MailService;
+import com.enonic.xp.mail.SendMailParams;
 
 @Component
 public class IssueNotificationsSenderImpl
  implements IssueNotificationsSender
 {
  private final MailService mailService;
 
- private final Executor executor;
-
  @Activate
- public IssueNotificationsSenderImpl( @Reference final MailService mailService,
- @Reference(service = IssueMailSendExecutor.class) final Executor executor )
+ public IssueNotificationsSenderImpl( @Reference final MailService mailService )
  {
  this.mailService = mailService;
- this.executor = executor;
  }
 
  @Override
  public void notifyIssueCreated( final IssueNotificationParams params )
  {
  if ( isRecipientsPresent( params ) )
  {
- final MailMessage mailMessage = new IssueCreatedMailMessageGenerator( params ).generateMessage();
+ final SendMailParams mailMessage =
+ new IssueCreatedMailMessageGenerator( params ).generateMessage( mailService.getDefaultFromEmail() );
  if ( mailMessage != null )
  {
- executor.execute( () -> mailService.send( mailMessage ) );
+ mailService.send( mailMessage );
  }
  }
  }
@@ -43,10 +38,11 @@ public void notifyIssuePublished( final IssuePublishedNotificationParams params
  {
  if ( isRecipientsPresent( params ) )
  {
- final MailMessage mailMessage = new IssuePublishedMailMessageGenerator( params ).generateMessage();
+ final SendMailParams mailMessage =
+ new IssuePublishedMailMessageGenerator( params ).generateMessage( mailService.getDefaultFromEmail() );
  if ( mailMessage != null )
  {
- executor.execute( () -> mailService.send( mailMessage ) );
+ mailService.send( mailMessage );
  }
  }
  }
@@ -56,10 +52,11 @@ public void notifyIssueUpdated( final IssueUpdatedNotificationParams params )
  {
  if ( isRecipientsPresent( params ) )
  {
- final MailMessage mailMessage = new IssueUpdatedMailMessageGenerator( params ).generateMessage();
+ final SendMailParams mailMessage =
+ new IssueUpdatedMailMessageGenerator( params ).generateMessage( mailService.getDefaultFromEmail() );
  if ( mailMessage != null )
  {
- executor.execute( () -> mailService.send( mailMessage ) );
+ mailService.send( mailMessage );
  }
  }
  }
@@ -69,10 +66,11 @@ public void notifyIssueCommented( final IssueCommentedNotificationParams params
  {
  if ( isRecipientsPresent( params ) )
  {
- final MailMessage mailMessage = new IssueCommentedMailMessageGenerator( params ).generateMessage();
+ final SendMailParams mailMessage =
+ new IssueCommentedMailMessageGenerator( params ).generateMessage( mailService.getDefaultFromEmail() );
  if ( mailMessage != null )
  {
- executor.execute( () -> mailService.send( mailMessage ) );
+ mailService.send( mailMessage );
  }
  }
  }

modules/rest/src/main/java/com/enonic/xp/app/contentstudio/rest/resource/issue/IssuePublishedMailMessageGenerator.java

@@ -37,14 +37,14 @@ protected String getSender()
  }
 
  @Override
- protected String generateRecipients()
+ protected Set<String> generateRecipients()
  {
  final String creatorEmail = super.getCreatorEmail();
  final String publisherEmail = params.getPublisher().getEmail();
  final Set<String> emails = getApproverEmails();
  emails.add( creatorEmail );
  filterEmail( emails, publisherEmail );
 
- return String.join( ",", emails );
+ return emails;
  }
 }

modules/rest/src/main/java/com/enonic/xp/app/contentstudio/rest/resource/issue/IssueUpdatedMailMessageGenerator.java

@@ -41,14 +41,14 @@ protected String getSender()
  }
 
  @Override
- protected String generateRecipients()
+ protected Set<String> generateRecipients()
  {
  final String creatorEmail = super.getCreatorEmail();
  final String modifierEmail = params.getModifier().getEmail();
  final Set<String> emails = getApproverEmails();
  emails.add( creatorEmail );
  filterEmail( emails, modifierEmail );
 
- return String.join( ",", emails );
+ return emails;
  }
 }