Get rid of our custom ThreadFactory interface, solely rely on j.u.c.ThreadFactory

Author: michaelklishin

src/com/rabbitmq/client/ConnectionFactory.java

@@ -25,14 +25,15 @@
 import java.net.URI;
 import java.net.URISyntaxException;
 import java.net.URLDecoder;
+import java.util.concurrent.Executors;
+import java.util.concurrent.ThreadFactory;
 
 import javax.net.SocketFactory;
 import javax.net.ssl.SSLSocketFactory;
 import javax.net.ssl.SSLContext;
 import javax.net.ssl.TrustManager;
 
 import com.rabbitmq.client.impl.AMQConnection;
-import com.rabbitmq.client.impl.DefaultThreadFactory;
 import com.rabbitmq.client.impl.ConnectionParams;
 import com.rabbitmq.client.impl.DefaultExceptionHandler;
 import com.rabbitmq.client.impl.FrameHandler;
@@ -91,7 +92,7 @@ public class ConnectionFactory implements Cloneable {
     private SocketFactory factory                 = SocketFactory.getDefault();
     private SaslConfig saslConfig                 = DefaultSaslConfig.PLAIN;
     private ExecutorService sharedExecutor;
-    private ThreadFactory threadFactory           = new DefaultThreadFactory();
+    private ThreadFactory threadFactory = Executors.defaultThreadFactory();
     private SocketConfigurator socketConf         = new DefaultSocketConfigurator();
     private ExceptionHandler exceptionHandler     = new DefaultExceptionHandler();
 
@@ -432,17 +433,15 @@ public void setSharedExecutor(ExecutorService executor) {
 
     /**
      * Retrieve the thread factory used to instantiate new threads.
-     * @see com.rabbitmq.client.ThreadFactory
-     * @see com.rabbitmq.client.impl.DefaultThreadFactory
+     * @see ThreadFactory
      */
     public ThreadFactory getThreadFactory() {
         return threadFactory;
     }
 
     /**
      * Set the thread factory used to instantiate new threads.
-     * @see com.rabbitmq.client.ThreadFactory
-     * @see com.rabbitmq.client.impl.DefaultThreadFactory
+     * @see ThreadFactory
      */
     public void setThreadFactory(ThreadFactory threadFactory) {
         this.threadFactory = threadFactory;

src/com/rabbitmq/client/ThreadFactory.java

@@ -27,6 +27,8 @@
 import java.util.Map;
 import java.util.concurrent.CopyOnWriteArrayList;
 import java.util.concurrent.ExecutorService;
+import java.util.concurrent.Executors;
+import java.util.concurrent.ThreadFactory;
 import java.util.concurrent.TimeoutException;
 
 import com.rabbitmq.client.AMQP;
@@ -46,7 +48,6 @@
 import com.rabbitmq.client.SaslConfig;
 import com.rabbitmq.client.SaslMechanism;
 import com.rabbitmq.client.ShutdownSignalException;
-import com.rabbitmq.client.ThreadFactory;
 import com.rabbitmq.client.impl.AMQChannel.BlockingRpcContinuation;
 import com.rabbitmq.utility.BlockingCell;
 
@@ -66,7 +67,7 @@ public class AMQConnection extends ShutdownNotifierComponent implements Connecti
     public static final int HANDSHAKE_TIMEOUT = 10000;
     private final ExecutorService executor;
     private Thread mainLoopThread;
-    private ThreadFactory threadFactory = new DefaultThreadFactory();
+    private ThreadFactory threadFactory = Executors.defaultThreadFactory();
 
     /**
      * Retrieve a copy of the default table of client properties that
@@ -280,7 +281,11 @@ public void start()
 
         // start the main loop going
         MainLoop loop = new MainLoop();
-        mainLoopThread = threadFactory.newThread(loop, "AMQP Connection " + getHostAddress() + ":" + getPort());
+        final String threadName = "AMQP Connection " + getHostAddress() + ":" + getPort();
+        mainLoopThread = threadFactory.newThread(loop);
+        if(Environment.isAllowedToModifyThreads()) {
+            mainLoopThread.setName(threadName);
+        }
         mainLoopThread.start();
         // after this point clear-up of MainLoop is triggered by closing the frameHandler.
 

src/com/rabbitmq/client/impl/AMQConnection.java

@@ -22,10 +22,11 @@
 import java.util.Map;
 import java.util.Set;
 import java.util.concurrent.CountDownLatch;
+import java.util.concurrent.Executors;
+import java.util.concurrent.ThreadFactory;
 import java.util.concurrent.TimeUnit;
 
 import com.rabbitmq.client.ShutdownSignalException;
-import com.rabbitmq.client.ThreadFactory;
 import com.rabbitmq.utility.IntAllocator;
 
 /**
@@ -53,7 +54,7 @@ public int getChannelMax(){
     }
 
     public ChannelManager(ConsumerWorkService workService, int channelMax) {
-        this(workService, channelMax, new DefaultThreadFactory());
+        this(workService, channelMax, Executors.defaultThreadFactory());
     }
 
     public ChannelManager(ConsumerWorkService workService, int channelMax, ThreadFactory threadFactory) {
@@ -112,8 +113,9 @@ public void run() {
                 ssWorkService.shutdown();
             }
         };
-        Thread shutdownThread = threadFactory.newThread(target, "ConsumerWorkService shutdown monitor");
+        Thread shutdownThread = threadFactory.newThread(target);
         if(Environment.isAllowedToModifyThreads()) {
+            shutdownThread.setName("ConsumerWorkService shutdown monitor");
             shutdownThread.setDaemon(true);
         }
         shutdownThread.start();

src/com/rabbitmq/client/impl/ChannelManager.java

@@ -2,10 +2,10 @@
 
 import com.rabbitmq.client.ExceptionHandler;
 import com.rabbitmq.client.SaslConfig;
-import com.rabbitmq.client.ThreadFactory;
 
 import java.util.Map;
 import java.util.concurrent.ExecutorService;
+import java.util.concurrent.ThreadFactory;
 
 public class ConnectionParams {
     private final String username;
@@ -21,7 +21,7 @@ public class ConnectionParams {
     private final boolean topologyRecovery;
 
     private ExceptionHandler exceptionHandler;
-  private ThreadFactory threadFactory;
+    private ThreadFactory threadFactory;
 
   /**
      * @param username name used to establish connection

src/com/rabbitmq/client/impl/ConnectionParams.java

@@ -1,10 +1,11 @@
 package com.rabbitmq.client.impl.recovery;
 
-import com.rabbitmq.client.ThreadFactory;
 import com.rabbitmq.client.impl.AMQConnection;
 import com.rabbitmq.client.impl.ConnectionParams;
 import com.rabbitmq.client.impl.FrameHandler;
 
+import java.util.concurrent.ThreadFactory;
+
 /**
  * {@link com.rabbitmq.client.impl.AMQConnection} modification that uses {@link com.rabbitmq.client.impl.recovery.RecoveryAwareChannelN}
  * @since 3.3.0

src/com/rabbitmq/client/impl/DefaultThreadFactory.java

@@ -7,7 +7,6 @@
 import com.rabbitmq.client.ShutdownSignalException;
 import com.rabbitmq.client.impl.AMQConnection;
 import com.rabbitmq.client.impl.ChannelN;
-import com.rabbitmq.client.impl.DefaultThreadFactory;
 import com.rabbitmq.client.impl.SocketFrameHandler;
 import com.rabbitmq.client.impl.ConsumerWorkService;
 import com.rabbitmq.client.test.BrokerTestCase;
@@ -81,7 +80,7 @@ public void testOpeningTooManyChannels() throws Exception {
 
             // Construct a channel directly
             final ChannelN ch = new ChannelN((AMQConnection) conn, n + 1,
-                                             new ConsumerWorkService(Executors.newSingleThreadExecutor(), new DefaultThreadFactory()));
+                                             new ConsumerWorkService(Executors.newSingleThreadExecutor(), Executors.defaultThreadFactory()));
             conn.addShutdownListener(new ShutdownListener() {
                 public void shutdownCompleted(ShutdownSignalException cause) {
                     // make sure channel.open continuation is released