Update TestMain

Author: michaelklishin

test/src/com/rabbitmq/examples/TestMain.java

@@ -29,17 +29,22 @@
 import com.rabbitmq.client.Connection;
 import com.rabbitmq.client.ConnectionFactory;
 import com.rabbitmq.client.DefaultConsumer;
+import com.rabbitmq.client.DefaultSocketConfigurator;
 import com.rabbitmq.client.Envelope;
 import com.rabbitmq.client.GetResponse;
 import com.rabbitmq.client.MessageProperties;
 import com.rabbitmq.client.Method;
 import com.rabbitmq.client.ReturnListener;
 import com.rabbitmq.client.ShutdownSignalException;
+import com.rabbitmq.client.SocketConfigurator;
 import com.rabbitmq.client.impl.AMQConnection;
 import com.rabbitmq.client.impl.FrameHandler;
+import com.rabbitmq.client.impl.FrameHandlerFactory;
 import com.rabbitmq.client.impl.SocketFrameHandler;
 import com.rabbitmq.utility.BlockingCell;
 
+import javax.net.SocketFactory;
+
 public class TestMain {
     public static void main(String[] args) throws IOException, URISyntaxException {
         // Show what version this class was compiled with, to check conformance testing
@@ -75,6 +80,25 @@ private static class TestConnectionFactory extends ConnectionFactory {
         private final int protocolMajor;
         private final int protocolMinor;
 
+        private class TestFrameHandlerFactory extends FrameHandlerFactory {
+            public TestFrameHandlerFactory(int connectionTimeout, SocketFactory factory, SocketConfigurator configurator, boolean ssl) {
+                super(connectionTimeout, factory, configurator, ssl);
+            }
+
+            @Override
+            public FrameHandler create(Address addr) throws IOException {
+                String hostName = addr.getHost();
+                int portNumber = addr.getPort();
+                if (portNumber == -1) portNumber = AMQP.PROTOCOL.PORT;
+                return new SocketFrameHandler(getSocketFactory().createSocket(hostName, portNumber)) {
+                    @Override
+                    public void sendHeader() throws IOException {
+                        sendHeader(protocolMajor, protocolMinor);
+                    }
+                };
+            }
+        }
+
         public TestConnectionFactory(int major, int minor, String uri)
             throws URISyntaxException, NoSuchAlgorithmException, KeyManagementException
         {
@@ -83,17 +107,10 @@ public TestConnectionFactory(int major, int minor, String uri)
             setUri(uri);
         }
 
-        public FrameHandler createFrameHandler(Address addr)
+        @Override
+        public FrameHandlerFactory createFrameHandlerFactory()
             throws IOException {
-
-            String hostName = addr.getHost();
-            int portNumber = addr.getPort();
-            if (portNumber == -1) portNumber = AMQP.PROTOCOL.PORT;
-            return new SocketFrameHandler(getSocketFactory().createSocket(hostName, portNumber)) {
-                    public void sendHeader() throws IOException {
-                        sendHeader(protocolMajor, protocolMinor);
-                    }
-                };
+            return new TestFrameHandlerFactory(10, SocketFactory.getDefault(), new DefaultSocketConfigurator(), false);
         }
     }