Default email sender is not working

#10404

modules/core/core-api/src/main/java/com/enonic/xp/mail/MailMessage.java

@@ -2,8 +2,12 @@
 
 import javax.mail.internet.MimeMessage;
 
+import com.enonic.xp.annotation.PublicApi;
+
+@PublicApi
 public interface MailMessage
 {
+    @Deprecated
     void compose( MimeMessage message )
         throws Exception;
 }

modules/core/core-api/src/main/java/com/enonic/xp/mail/MailMessageParams.java

@@ -0,0 +1,188 @@
+package com.enonic.xp.mail;
+
+import java.util.List;
+import java.util.Map;
+import java.util.Objects;
+
+import com.enonic.xp.annotation.PublicApi;
+
+@PublicApi
+public class MailMessageParams
+{
+    private final String[] to;
+
+    private final String[] from;
+
+    private final String[] cc;
+
+    private final String[] bcc;
+
+    private final String[] replyTo;
+
+    private final String subject;
+
+    private final String contentType;
+
+    private final String body;
+
+    private final Map<String, String> headers;
+
+    private final List<Map<String, Object>> attachments;
+
+    private MailMessageParams( Builder builder )
+    {
+        this.to = Objects.requireNonNullElse( builder.to, new String[]{} );
+        this.from = Objects.requireNonNullElse( builder.from, new String[]{} );
+        this.cc = Objects.requireNonNullElse( builder.cc, new String[]{} );
+        this.bcc = Objects.requireNonNullElse( builder.bcc, new String[]{} );
+        this.replyTo = Objects.requireNonNullElse( builder.replyTo, new String[]{} );
+        this.subject = builder.subject;
+        this.contentType = builder.contentType;
+        this.body = builder.body;
+        this.headers = builder.headers;
+        this.attachments = builder.attachments;
+    }
+
+    public static Builder create()
+    {
+        return new Builder();
+    }
+
+    public String[] getTo()
+    {
+        return to;
+    }
+
+    public String[] getFrom()
+    {
+        return from;
+    }
+
+    public String[] getCc()
+    {
+        return cc;
+    }
+
+    public String[] getBcc()
+    {
+        return bcc;
+    }
+
+    public String[] getReplyTo()
+    {
+        return replyTo;
+    }
+
+    public String getSubject()
+    {
+        return subject;
+    }
+
+    public String getContentType()
+    {
+        return contentType;
+    }
+
+    public String getBody()
+    {
+        return body;
+    }
+
+    public Map<String, String> getHeaders()
+    {
+        return headers;
+    }
+
+    public List<Map<String, Object>> getAttachments()
+    {
+        return attachments;
+    }
+
+    public static class Builder
+    {
+        private String[] to;
+
+        private String[] from;
+
+        private String[] cc;
+
+        private String[] bcc;
+
+        private String[] replyTo;
+
+        private String subject;
+
+        private String contentType;
+
+        private String body;
+
+        private Map<String, String> headers;
+
+        private List<Map<String, Object>> attachments;
+
+        public Builder setTo( final String[] to )
+        {
+            this.to = to;
+            return this;
+        }
+
+        public Builder setFrom( final String[] from )
+        {
+            this.from = from;
+            return this;
+        }
+
+        public Builder setCc( final String[] cc )
+        {
+            this.cc = cc;
+            return this;
+        }
+
+        public Builder setBcc( final String[] bcc )
+        {
+            this.bcc = bcc;
+            return this;
+        }
+
+        public Builder setReplyTo( final String[] replyTo )
+        {
+            this.replyTo = replyTo;
+            return this;
+        }
+
+        public Builder setSubject( final String subject )
+        {
+            this.subject = subject;
+            return this;
+        }
+
+        public Builder setContentType( final String contentType )
+        {
+            this.contentType = contentType;
+            return this;
+        }
+
+        public Builder setBody( final String body )
+        {
+            this.body = body;
+            return this;
+        }
+
+        public Builder setHeaders( final Map<String, String> headers )
+        {
+            this.headers = headers;
+            return this;
+        }
+
+        public Builder setAttachments( final List<Map<String, Object>> attachments )
+        {
+            this.attachments = attachments;
+            return this;
+        }
+
+        public MailMessageParams build()
+        {
+            return new MailMessageParams( this );
+        }
+    }
+}

modules/core/core-api/src/main/java/com/enonic/xp/mail/MailService.java

@@ -1,6 +1,12 @@
 package com.enonic.xp.mail;
 
+import com.enonic.xp.annotation.PublicApi;
+
+@PublicApi
 public interface MailService
 {
+    @Deprecated
     void send( MailMessage message );
+
+    void send( MailMessageParams message );
 }

modules/core/core-mail/build.gradle

@@ -1,5 +1,6 @@
 dependencies {
     implementation project( ':core:core-api' )
+    implementation project( ':core:core-internal' )
 
     testImplementation ( libs.mockjavamail ) {
         exclude group: 'javax.mail'

modules/core/core-mail/src/main/java/com/enonic/xp/mail/impl/MailServiceImpl.java

@@ -1,6 +1,8 @@
 package com.enonic.xp.mail.impl;
 
+import java.time.Duration;
 import java.util.Properties;
+import java.util.concurrent.Executors;
 
 import javax.mail.Address;
 import javax.mail.Authenticator;
@@ -11,18 +13,35 @@
 
 import org.osgi.service.component.annotations.Activate;
 import org.osgi.service.component.annotations.Component;
+import org.osgi.service.component.annotations.Deactivate;
+import org.osgi.service.component.annotations.Modified;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
 
+import com.enonic.xp.core.internal.concurrent.SimpleExecutor;
 import com.enonic.xp.mail.MailException;
 import com.enonic.xp.mail.MailMessage;
+import com.enonic.xp.mail.MailMessageParams;
 import com.enonic.xp.mail.MailService;
 
 @Component(immediate = true, configurationPid = "com.enonic.xp.mail")
 public final class MailServiceImpl
     implements MailService
 {
+    private static final Logger LOG = LoggerFactory.getLogger( MailServiceImpl.class );
+
+    private final SimpleExecutor simpleExecutor;
+
     private Session session;
 
+    public MailServiceImpl()
+    {
+        this.simpleExecutor = new SimpleExecutor( Executors::newCachedThreadPool, "mail-service-executor-thread-%d",
+                                                  e -> LOG.error( "Message sending failed", e ) );
+    }
+
     @Activate
+    @Modified
     public void activate( final MailConfig config )
     {
         final Properties properties = new Properties();
@@ -47,6 +66,12 @@ public void activate( final MailConfig config )
         }
     }
 
+    @Deactivate
+    public void deactivate()
+    {
+        simpleExecutor.shutdownAndAwaitTermination( Duration.ofSeconds( 5 ), neverCommenced -> LOG.warn( "Not all messages were sent" ) );
+    }
+
     @Override
     public void send( final MailMessage message )
     {
@@ -62,6 +87,29 @@ public void send( final MailMessage message )
         }
     }
 
+    @Override
+    public void send( final MailMessageParams params )
+    {
+        try
+        {
+            MimeMessage message = MimeMessageConverter.convert( session, params );
+            simpleExecutor.execute( () -> {
+                try
+                {
+                    doSend( message );
+                }
+                catch ( Exception e )
+                {
+                    throw new RuntimeException( e );
+                }
+            } );
+        }
+        catch ( final Exception e )
+        {
+            throw handleException( e );
+        }
+    }
+
     private MimeMessage newMessage()
     {
         return new MimeMessage( this.session );