#204: Moved concurrent helper classes to separate package, cleaned up Runnable a little bit at the same time

Author: bbottema

src/main/java/org/simplejavamail/mailer/internal/mailsender/MailSender.java

@@ -6,6 +6,8 @@
 import org.simplejavamail.email.Recipient;
 import org.simplejavamail.mailer.MailerGenericBuilder;
 import org.simplejavamail.mailer.config.TransportStrategy;
+import org.simplejavamail.mailer.internal.mailsender.concurrent.NamedRunnable;
+import org.simplejavamail.mailer.internal.mailsender.concurrent.NonJvmBlockingThreadPoolExecutor;
 import org.simplejavamail.mailer.internal.socks.AuthenticatingSocks5Bridge;
 import org.simplejavamail.mailer.internal.socks.SocksProxyConfig;
 import org.simplejavamail.mailer.internal.socks.socks5server.AnonymousSocks5Server;
@@ -23,10 +25,7 @@
 import java.util.List;
 import java.util.Properties;
 import java.util.concurrent.ExecutorService;
-import java.util.concurrent.LinkedBlockingQueue;
 import java.util.concurrent.Phaser;
-import java.util.concurrent.ThreadPoolExecutor;
-import java.util.concurrent.TimeUnit;
 
 import static java.lang.String.format;
 import static org.simplejavamail.converter.EmailConverter.mimeMessageToEML;
@@ -180,7 +179,7 @@ private static AnonymousSocks5Server configureSessionWithProxy(@Nonnull final Pr
 	 * @param async If false, this method blocks until the mail has been processed completely by the SMTP server. If true, a new thread is started to
 	 *              send the email and this method returns immediately.
 	 * @throws MailException Can be thrown if an email isn't validating correctly, or some other problem occurs during connection, sending etc.
-	 * @see Executors#newFixedThreadPool(int)
+	 * @see NonJvmBlockingThreadPoolExecutor
 	 */
 	public final synchronized void send(final Email email, final boolean async) {
 		/*
@@ -195,30 +194,14 @@ the proxy bridge server (or connection pool in async mode) while a non-async ema
 		if (async) {
 			// start up thread pool if necessary
 			if (executor == null) {
-				ThreadPoolExecutor threadPoolExecutor = new ThreadPoolExecutor(
-					operationalConfig.getThreadPoolSize(),
-					operationalConfig.getThreadPoolSize(),
-					operationalConfig.getThreadPoolTimeout(),
-					TimeUnit.MILLISECONDS,
-					new LinkedBlockingQueue<Runnable>(),
-					new NamedThreadFactory("Simple Java Mail async mail sender")
-				);
-				if(operationalConfig.getThreadPoolTimeout() > 0) {
-					threadPoolExecutor.allowCoreThreadTimeOut(true);
-				}
-				executor = threadPoolExecutor;
+				executor = new NonJvmBlockingThreadPoolExecutor(operationalConfig, "Simple Java Mail async mail sender");
 			}
 			configureSessionWithTimeout(session, operationalConfig.getSessionTimeout());
-			executor.execute(new Runnable() {
+			executor.execute(new NamedRunnable("sendMail process") {
 				@Override
 				public void run() {
 					sendMailClosure(session, email);
 				}
-
-				@Override
-				public String toString() {
-					return "sendMail process";
-				}
 			});
 		} else {
 			sendMailClosure(session, email);

src/main/java/org/simplejavamail/mailer/internal/mailsender/concurrent/NamedRunnable.java

@@ -0,0 +1,14 @@
+package org.simplejavamail.mailer.internal.mailsender.concurrent;
+
+public abstract class NamedRunnable implements Runnable {
+	private final String name;
+	
+	protected NamedRunnable(String name) {
+		this.name = name;
+	}
+	
+	@Override
+	public String toString() {
+		return name;
+	}
+}

src/main/java/org/simplejavamail/mailer/internal/mailsender/NamedThreadFactory.java src/main/java/org/simplejavamail/mailer/internal/mailsender/concurrent/NamedThreadFactory.java

@@ -1,4 +1,4 @@
-package org.simplejavamail.mailer.internal.mailsender;
+package org.simplejavamail.mailer.internal.mailsender.concurrent;
 
 import javax.annotation.Nonnull;
 import java.util.concurrent.ThreadFactory;
@@ -12,7 +12,7 @@ class NamedThreadFactory implements ThreadFactory {
 	private final ThreadGroup group;
 	private final String threadName;
 
-	NamedThreadFactory(@Nonnull final String threadName) {
+	public NamedThreadFactory(@Nonnull final String threadName) {
 		SecurityManager s = System.getSecurityManager();
 		group = (s != null) ? s.getThreadGroup() : currentThread().getThreadGroup();
 		this.threadName = threadName;

src/main/java/org/simplejavamail/mailer/internal/mailsender/concurrent/NonJvmBlockingThreadPoolExecutor.java

@@ -0,0 +1,26 @@
+package org.simplejavamail.mailer.internal.mailsender.concurrent;
+
+import org.simplejavamail.mailer.internal.mailsender.OperationalConfig;
+
+import java.util.concurrent.LinkedBlockingQueue;
+import java.util.concurrent.ThreadPoolExecutor;
+import java.util.concurrent.TimeUnit;
+
+/**
+ * @see ThreadPoolExecutor
+ * @see LinkedBlockingQueue
+ * @see NamedThreadFactory
+ */
+public class NonJvmBlockingThreadPoolExecutor extends ThreadPoolExecutor {
+	public NonJvmBlockingThreadPoolExecutor(OperationalConfig operationalConfig, String threadNamePrefix) {
+		super(operationalConfig.getThreadPoolSize(),
+				operationalConfig.getThreadPoolSize(),
+				operationalConfig.getThreadPoolTimeout(),
+				TimeUnit.MILLISECONDS,
+				new LinkedBlockingQueue<Runnable>(),
+				new NamedThreadFactory(threadNamePrefix));
+		if (operationalConfig.getThreadPoolTimeout() > 0) {
+			allowCoreThreadTimeOut(true);
+		}
+	}
+}