test(ConnectionFactory): Update several existing tests to use the new fluent API to configure ConnectionFactory instances

Author: Ennio Kerber

src/test/java/com/rabbitmq/client/test/ConnectionFactoryTest.java

@@ -25,6 +25,7 @@
 
 import javax.net.SocketFactory;
 import java.io.IOException;
+import java.util.HashMap;
 import java.util.List;
 import java.util.Map;
 import java.util.Queue;
@@ -203,7 +204,7 @@ public TestConfig(int value, Consumer<Integer> call, boolean expectException) {
     @Test
     public void shouldBeConfigurableUsingFluentAPI() throws Exception {
         /* GIVEN */
-        Map<String, Object> clientProperties = Map.of();
+        Map<String, Object> clientProperties = new HashMap<>();
         SaslConfig saslConfig = mock(SaslConfig.class);
         ConnectionFactory connectionFactory = new ConnectionFactory();
         SocketFactory socketFactory = mock(SocketFactory.class);

src/test/java/com/rabbitmq/client/test/JavaNioTest.java

@@ -30,8 +30,8 @@ public class JavaNioTest {
 
     @BeforeEach
     public void init() throws Exception {
-        ConnectionFactory connectionFactory = new ConnectionFactory();
-        connectionFactory.useNio();
+        ConnectionFactory connectionFactory = new ConnectionFactory()
+                .useNio();
         testConnection = connectionFactory.newConnection();
     }
 
@@ -46,8 +46,8 @@ public void tearDown() throws Exception {
     @Test
     public void connection() throws Exception {
         CountDownLatch latch = new CountDownLatch(1);
-        ConnectionFactory connectionFactory = new ConnectionFactory();
-        connectionFactory.useNio();
+        ConnectionFactory connectionFactory = new ConnectionFactory()
+                .useNio();
         Connection connection = null;
         try {
             connection = basicGetBasicConsume(connectionFactory, "nio.queue", latch);
@@ -61,9 +61,9 @@ public void connection() throws Exception {
     @Test
     public void twoConnections() throws IOException, TimeoutException, InterruptedException {
         CountDownLatch latch = new CountDownLatch(2);
-        ConnectionFactory connectionFactory = new ConnectionFactory();
-        connectionFactory.useNio();
-        connectionFactory.setNioParams(new NioParams().setNbIoThreads(4));
+        ConnectionFactory connectionFactory = new ConnectionFactory()
+                .useNio()
+                .setNioParams(new NioParams().setNbIoThreads(4));
         Connection connection1 = null;
         Connection connection2 = null;
         try {
@@ -82,8 +82,8 @@ public void twoConnections() throws IOException, TimeoutException, InterruptedEx
     public void twoConnectionsWithNioExecutor() throws IOException, TimeoutException, InterruptedException {
         CountDownLatch latch = new CountDownLatch(2);
         ExecutorService nioExecutor = Executors.newFixedThreadPool(5);
-        ConnectionFactory connectionFactory = new ConnectionFactory();
-        connectionFactory.useNio();
+        ConnectionFactory connectionFactory = new ConnectionFactory()
+                .useNio();
         Connection connection1 = null;
         Connection connection2 = null;
         try {
@@ -101,8 +101,8 @@ public void twoConnectionsWithNioExecutor() throws IOException, TimeoutException
 
     @Test
     public void shutdownListenerCalled() throws IOException, TimeoutException, InterruptedException {
-        ConnectionFactory connectionFactory = new ConnectionFactory();
-        connectionFactory.useNio();
+        ConnectionFactory connectionFactory = new ConnectionFactory()
+                .useNio();
         Connection connection = connectionFactory.newConnection();
         try {
             final CountDownLatch latch = new CountDownLatch(1);
@@ -122,8 +122,8 @@ public void shutdownCompleted(ShutdownSignalException cause) {
 
     @Test
     public void nioLoopCleaning() throws Exception {
-        ConnectionFactory connectionFactory = new ConnectionFactory();
-        connectionFactory.useNio();
+        ConnectionFactory connectionFactory = new ConnectionFactory()
+                .useNio();
         for (int i = 0; i < 10; i++) {
             Connection connection = connectionFactory.newConnection();
             connection.abort();
@@ -139,20 +139,20 @@ public void messageSize() throws Exception {
 
     @Test
     public void byteBufferFactory() throws Exception {
-        ConnectionFactory cf = new ConnectionFactory();
-        cf.useNio();
+        ConnectionFactory connectionFactory = new ConnectionFactory()
+                .useNio();
         int baseCapacity = 32768;
         NioParams nioParams = new NioParams();
         nioParams.setReadByteBufferSize(baseCapacity / 2);
         nioParams.setWriteByteBufferSize(baseCapacity / 4);
         List<ByteBuffer> byteBuffers = new CopyOnWriteArrayList<>();
-        cf.setNioParams(nioParams.setByteBufferFactory(new DefaultByteBufferFactory(capacity -> {
+        connectionFactory.setNioParams(nioParams.setByteBufferFactory(new DefaultByteBufferFactory(capacity -> {
             ByteBuffer bb = ByteBuffer.allocate(capacity);
             byteBuffers.add(bb);
             return bb;
         })));
 
-        try (Connection c = cf.newConnection()) {
+        try (Connection c = connectionFactory.newConnection()) {
             sendAndVerifyMessage(c, 100);
         }
 
@@ -165,27 +165,27 @@ public void byteBufferFactory() throws Exception {
 
     @Test
     public void directByteBuffers() throws Exception {
-        ConnectionFactory cf = new ConnectionFactory();
-        cf.useNio();
-        cf.setNioParams(new NioParams().setByteBufferFactory(new DefaultByteBufferFactory(capacity -> ByteBuffer.allocateDirect(capacity))));
-        try (Connection c = cf.newConnection()) {
+        ConnectionFactory connectionFactory = new ConnectionFactory()
+                .useNio()
+                .setNioParams(new NioParams().setByteBufferFactory(new DefaultByteBufferFactory(capacity -> ByteBuffer.allocateDirect(capacity))));
+        try (Connection c = connectionFactory.newConnection()) {
             sendAndVerifyMessage(c, 100);
         }
     }
 
     @Test
     public void customWriteQueue() throws Exception {
-        ConnectionFactory cf = new ConnectionFactory();
-        cf.useNio();
         AtomicInteger count = new AtomicInteger(0);
-        cf.setNioParams(new NioParams().setWriteQueueFactory(ctx -> {
-            count.incrementAndGet();
-            return new BlockingQueueNioQueue(
-                    new LinkedBlockingQueue<>(ctx.getNioParams().getWriteQueueCapacity()),
-                    ctx.getNioParams().getWriteEnqueuingTimeoutInMs()
-            );
-        }));
-        try (Connection c = cf.newConnection()) {
+        ConnectionFactory connectionFactory = new ConnectionFactory()
+                .useNio()
+                .setNioParams(new NioParams().setWriteQueueFactory(ctx -> {
+                    count.incrementAndGet();
+                    return new BlockingQueueNioQueue(
+                            new LinkedBlockingQueue<>(ctx.getNioParams().getWriteQueueCapacity()),
+                            ctx.getNioParams().getWriteEnqueuingTimeoutInMs()
+                    );
+                }));
+        try (Connection c = connectionFactory.newConnection()) {
             sendAndVerifyMessage(c, 100);
         }
         assertEquals(1, count.get());

src/test/java/com/rabbitmq/client/test/SslContextFactoryTest.java

@@ -40,30 +40,22 @@
 public class SslContextFactoryTest {
 
     @Test public void setSslContextFactory() throws Exception {
-        doTestSetSslContextFactory(() -> {
-            ConnectionFactory connectionFactory = new ConnectionFactory();
-            connectionFactory.useBlockingIo();
-            connectionFactory.setAutomaticRecoveryEnabled(true);
-            return connectionFactory;
-        });
-        doTestSetSslContextFactory(() -> {
-            ConnectionFactory connectionFactory = new ConnectionFactory();
-            connectionFactory.useNio();
-            connectionFactory.setAutomaticRecoveryEnabled(true);
-            return connectionFactory;
-        });
-        doTestSetSslContextFactory(() -> {
-            ConnectionFactory connectionFactory = new ConnectionFactory();
-            connectionFactory.useBlockingIo();
-            connectionFactory.setAutomaticRecoveryEnabled(false);
-            return connectionFactory;
-        });
-        doTestSetSslContextFactory(() -> {
-            ConnectionFactory connectionFactory = new ConnectionFactory();
-            connectionFactory.useNio();
-            connectionFactory.setAutomaticRecoveryEnabled(false);
-            return connectionFactory;
-        });
+        doTestSetSslContextFactory(() -> new ConnectionFactory()
+                .useBlockingIo()
+                .setAutomaticRecoveryEnabled(true)
+        );
+        doTestSetSslContextFactory(() -> new ConnectionFactory()
+                .useNio()
+                .setAutomaticRecoveryEnabled(true)
+        );
+        doTestSetSslContextFactory(() -> new ConnectionFactory()
+                .useBlockingIo()
+                .setAutomaticRecoveryEnabled(false)
+        );
+        doTestSetSslContextFactory(() -> new ConnectionFactory()
+                .useNio()
+                .setAutomaticRecoveryEnabled(false)
+        );
     }
 
     private void doTestSetSslContextFactory(Supplier<ConnectionFactory> supplier) throws Exception {
@@ -82,31 +74,27 @@ private void doTestSetSslContextFactory(Supplier<ConnectionFactory> supplier) th
     }
 
     @Test public void socketFactoryTakesPrecedenceOverSslContextFactoryWithBlockingIo() throws Exception {
-        doTestSocketFactoryTakesPrecedenceOverSslContextFactoryWithBlockingIo(() -> {
-            ConnectionFactory connectionFactory = new ConnectionFactory();
-            connectionFactory.useBlockingIo();
-            connectionFactory.setAutomaticRecoveryEnabled(true);
-            return connectionFactory;
-        });
-        doTestSocketFactoryTakesPrecedenceOverSslContextFactoryWithBlockingIo(() -> {
-            ConnectionFactory connectionFactory = new ConnectionFactory();
-            connectionFactory.useBlockingIo();
-            connectionFactory.setAutomaticRecoveryEnabled(false);
-            return connectionFactory;
-        });
+        doTestSocketFactoryTakesPrecedenceOverSslContextFactoryWithBlockingIo(() -> new ConnectionFactory()
+                .useBlockingIo()
+                .setAutomaticRecoveryEnabled(true)
+        );
+        doTestSocketFactoryTakesPrecedenceOverSslContextFactoryWithBlockingIo(() -> new ConnectionFactory()
+                .useBlockingIo()
+                .setAutomaticRecoveryEnabled(false)
+        );
     }
 
     private void doTestSocketFactoryTakesPrecedenceOverSslContextFactoryWithBlockingIo(
                 Supplier<ConnectionFactory> supplier
             ) throws Exception {
-        ConnectionFactory connectionFactory = supplier.get();
-        connectionFactory.useBlockingIo();
         SslContextFactory sslContextFactory = sslContextFactory();
-        connectionFactory.setSslContextFactory(sslContextFactory);
-
         SSLContext contextAcceptAll = sslContextFactory.create("connection01");
-        connectionFactory.setSocketFactory(contextAcceptAll.getSocketFactory());
-
+        ConnectionFactory connectionFactory = supplier.get();
+        connectionFactory
+                .useBlockingIo()
+                .setSslContextFactory(sslContextFactory)
+                .setSocketFactory(contextAcceptAll.getSocketFactory());
+        
         Connection connection = connectionFactory.newConnection("connection01");
         TestUtils.close(connection);
         connection = connectionFactory.newConnection("connection02");