Refactor NIO factories to Java 6

acogoluegnes · acogoluegnes · commit 7579bf868721 · 2018-10-15T10:18:22.000+02:00
References #410
diff --git a/src/main/java/com/rabbitmq/client/impl/nio/ByteBufferFactory.java b/src/main/java/com/rabbitmq/client/impl/nio/ByteBufferFactory.java
@@ -6,7 +6,7 @@
  * Contract to create {@link ByteBuffer}s.
  *
  * @see NioParams
- * @since 5.5.0
+ * @since 4.9.0
  */
 public interface ByteBufferFactory {
 
diff --git a/src/main/java/com/rabbitmq/client/impl/nio/DefaultByteBufferFactory.java b/src/main/java/com/rabbitmq/client/impl/nio/DefaultByteBufferFactory.java
@@ -1,44 +1,49 @@
 package com.rabbitmq.client.impl.nio;
 
 import java.nio.ByteBuffer;
-import java.util.function.Function;
 
 /**
  * Default {@link ByteBufferFactory} that creates heap-based {@link ByteBuffer}s.
- * This behavior can be changed by passing in a custom {@link Function<Integer, ByteBuffer>}
+ * This behavior can be changed by passing in a custom {@link ByteBufferAllocator}
  * to the constructor.
  *
  * @see NioParams
  * @see ByteBufferFactory
- * @since 5.5.0
+ * @since 4.9.0
  */
 public class DefaultByteBufferFactory implements ByteBufferFactory {
 
-    private final Function<Integer, ByteBuffer> allocator;
+    private final ByteBufferAllocator allocator;
 
-    public DefaultByteBufferFactory(Function<Integer, ByteBuffer> allocator) {
+    public DefaultByteBufferFactory(ByteBufferAllocator allocator) {
         this.allocator = allocator;
     }
 
     public DefaultByteBufferFactory() {
-        this(capacity -> ByteBuffer.allocate(capacity));
+        this(new ByteBufferAllocator() {
+
+            @Override
+            public ByteBuffer allocate(int capacity) {
+                return ByteBuffer.allocate(capacity);
+            }
+        });
     }
 
     @Override
     public ByteBuffer createReadBuffer(NioContext nioContext) {
         if (nioContext.getSslEngine() == null) {
-            return allocator.apply(nioContext.getNioParams().getReadByteBufferSize());
+            return allocator.allocate(nioContext.getNioParams().getReadByteBufferSize());
         } else {
-            return allocator.apply(nioContext.getSslEngine().getSession().getApplicationBufferSize());
+            return allocator.allocate(nioContext.getSslEngine().getSession().getApplicationBufferSize());
         }
     }
 
     @Override
     public ByteBuffer createWriteBuffer(NioContext nioContext) {
         if (nioContext.getSslEngine() == null) {
-            return allocator.apply(nioContext.getNioParams().getWriteByteBufferSize());
+            return allocator.allocate(nioContext.getNioParams().getWriteByteBufferSize());
         } else {
-            return allocator.apply(nioContext.getSslEngine().getSession().getApplicationBufferSize());
+            return allocator.allocate(nioContext.getSslEngine().getSession().getApplicationBufferSize());
         }
     }
 
@@ -56,7 +61,12 @@ protected ByteBuffer createEncryptedByteBuffer(NioContext nioContext) {
         if (nioContext.getSslEngine() == null) {
             throw new IllegalArgumentException("Encrypted byte buffer should be created only in SSL/TLS context");
         } else {
-            return allocator.apply(nioContext.getSslEngine().getSession().getPacketBufferSize());
+            return allocator.allocate(nioContext.getSslEngine().getSession().getPacketBufferSize());
         }
     }
+
+    public interface ByteBufferAllocator {
+
+        ByteBuffer allocate(int capacity);
+    }
 }
diff --git a/src/main/java/com/rabbitmq/client/impl/nio/NioParams.java b/src/main/java/com/rabbitmq/client/impl/nio/NioParams.java
@@ -25,7 +25,6 @@
 import java.util.concurrent.ArrayBlockingQueue;
 import java.util.concurrent.ExecutorService;
 import java.util.concurrent.ThreadFactory;
-import java.util.function.Function;
 
 import static com.rabbitmq.client.SslEngineConfigurators.ENABLE_HOSTNAME_VERIFICATION;
 
@@ -36,11 +35,17 @@
  */
 public class NioParams {
 
-    static Function<NioContext, NioQueue> DEFAULT_WRITE_QUEUE_FACTORY =
-        ctx -> new BlockingQueueNioQueue(
-            new ArrayBlockingQueue<>(ctx.getNioParams().getWriteQueueCapacity(), true),
-            ctx.getNioParams().getWriteEnqueuingTimeoutInMs()
-        );
+    static NioQueueFactory DEFAULT_WRITE_QUEUE_FACTORY =
+        new NioQueueFactory() {
+
+            @Override
+            public NioQueue create(NioContext ctx) {
+                return new BlockingQueueNioQueue(
+                    new ArrayBlockingQueue<WriteRequest>(ctx.getNioParams().getWriteQueueCapacity(), true),
+                    ctx.getNioParams().getWriteEnqueuingTimeoutInMs()
+                );
+            }
+        };
 
     /**
      * size of the byte buffer used for inbound data
@@ -103,16 +108,16 @@ public void configure(SSLEngine sslEngine) throws IOException {
      * The factory to create {@link java.nio.ByteBuffer}s.
      * The default is to create heap-based {@link java.nio.ByteBuffer}s.
      *
-     * @since 5.5.0
+     * @since 4.9.0
      */
     private ByteBufferFactory byteBufferFactory = new DefaultByteBufferFactory();
 
     /**
      * Factory to create a {@link NioQueue}.
      *
-     * @since 5.5.0
+     * @since 4.9.0
      */
-    private Function<NioContext, NioQueue> writeQueueFactory =
+    private NioQueueFactory writeQueueFactory =
         DEFAULT_WRITE_QUEUE_FACTORY;
 
     public NioParams() {
@@ -419,15 +424,14 @@ public ByteBufferFactory getByteBufferFactory() {
      * @param writeQueueFactory the factory to use
      * @return this {@link NioParams} instance
      * @see NioQueue
-     * @since 5.5.0
+     * @since 4.9.0
      */
-    public NioParams setWriteQueueFactory(
-        Function<NioContext, NioQueue> writeQueueFactory) {
+    public NioParams setWriteQueueFactory(NioQueueFactory writeQueueFactory) {
         this.writeQueueFactory = writeQueueFactory;
         return this;
     }
 
-    public Function<NioContext, NioQueue> getWriteQueueFactory() {
+    public NioQueueFactory getWriteQueueFactory() {
         return writeQueueFactory;
     }
 }
diff --git a/src/main/java/com/rabbitmq/client/impl/nio/NioQueueFactory.java b/src/main/java/com/rabbitmq/client/impl/nio/NioQueueFactory.java
@@ -0,0 +1,18 @@
+package com.rabbitmq.client.impl.nio;
+
+/**
+ * Contract to create {@link NioQueue}.
+ *
+ * @see NioQueue
+ * @since 4.9.0
+ */
+public interface NioQueueFactory {
+
+    /**
+     * Create a {@link NioQueue} instance
+     *
+     * @param nioContext
+     * @return
+     */
+    NioQueue create(NioContext nioContext);
+}
diff --git a/src/main/java/com/rabbitmq/client/impl/nio/SocketChannelFrameHandlerState.java b/src/main/java/com/rabbitmq/client/impl/nio/SocketChannelFrameHandlerState.java
@@ -78,8 +78,8 @@ public SocketChannelFrameHandlerState(SocketChannel channel, NioLoopContext nioL
         NioContext nioContext = new NioContext(nioParams, sslEngine);
 
         this.writeQueue = nioParams.getWriteQueueFactory() == null ?
-            NioParams.DEFAULT_WRITE_QUEUE_FACTORY.apply(nioContext) :
-            nioParams.getWriteQueueFactory().apply(nioContext);
+            NioParams.DEFAULT_WRITE_QUEUE_FACTORY.create(nioContext) :
+            nioParams.getWriteQueueFactory().create(nioContext);
 
         this.sslEngine = sslEngine;
         if(this.sslEngine == null) {
diff --git a/src/test/java/com/rabbitmq/client/test/JavaNioTest.java b/src/test/java/com/rabbitmq/client/test/JavaNioTest.java
@@ -3,7 +3,11 @@
 import com.rabbitmq.client.*;
 import com.rabbitmq.client.impl.nio.BlockingQueueNioQueue;
 import com.rabbitmq.client.impl.nio.DefaultByteBufferFactory;
+import com.rabbitmq.client.impl.nio.NioContext;
 import com.rabbitmq.client.impl.nio.NioParams;
+import com.rabbitmq.client.impl.nio.NioQueue;
+import com.rabbitmq.client.impl.nio.NioQueueFactory;
+import com.rabbitmq.client.impl.nio.WriteRequest;
 import org.junit.After;
 import org.junit.Before;
 import org.junit.Test;
@@ -144,15 +148,22 @@ public void nioLoopCleaning() throws Exception {
         NioParams nioParams = new NioParams();
         nioParams.setReadByteBufferSize(baseCapacity / 2);
         nioParams.setWriteByteBufferSize(baseCapacity / 4);
-        List<ByteBuffer> byteBuffers = new CopyOnWriteArrayList<>();
-        cf.setNioParams(nioParams.setByteBufferFactory(new DefaultByteBufferFactory(capacity -> {
-            ByteBuffer bb = ByteBuffer.allocate(capacity);
-            byteBuffers.add(bb);
-            return bb;
+        final List<ByteBuffer> byteBuffers = new CopyOnWriteArrayList<ByteBuffer>();
+        cf.setNioParams(nioParams.setByteBufferFactory(new DefaultByteBufferFactory(new DefaultByteBufferFactory.ByteBufferAllocator() {
+
+            @Override
+            public ByteBuffer allocate(int capacity) {
+                ByteBuffer bb = ByteBuffer.allocate(capacity);
+                byteBuffers.add(bb);
+                return bb;
+            }
         })));
 
-        try (Connection c = cf.newConnection()) {
+        Connection c = cf.newConnection();
+        try {
             sendAndVerifyMessage(c, 100);
+        } finally {
+            TestUtils.close(c);
         }
 
         assertThat(byteBuffers, hasSize(2));
@@ -163,25 +174,41 @@ public void nioLoopCleaning() 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()) {
+        cf.setNioParams(new NioParams().setByteBufferFactory(new DefaultByteBufferFactory(new DefaultByteBufferFactory.ByteBufferAllocator() {
+
+            @Override
+            public ByteBuffer allocate(int capacity) {
+                return ByteBuffer.allocateDirect(capacity);
+            }
+        })));
+        Connection c = cf.newConnection();
+        try {
             sendAndVerifyMessage(c, 100);
+        } finally {
+            TestUtils.close(c);
         }
     }
 
     @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()
-            );
+        final AtomicInteger count = new AtomicInteger(0);
+        cf.setNioParams(new NioParams().setWriteQueueFactory(new NioQueueFactory() {
+
+            @Override
+            public NioQueue create(NioContext ctx) {
+                count.incrementAndGet();
+                return new BlockingQueueNioQueue(
+                    new LinkedBlockingQueue<WriteRequest>(ctx.getNioParams().getWriteQueueCapacity()),
+                    ctx.getNioParams().getWriteEnqueuingTimeoutInMs()
+                );
+            }
         }));
-        try (Connection c = cf.newConnection()) {
+        Connection c = cf.newConnection();
+        try {
             sendAndVerifyMessage(c, 100);
+        } finally {
+            TestUtils.close(c);
         }
         assertEquals(1, count.get());
     }

Original file line number	Diff line number	Diff line change
`@@ -6,7 +6,7 @@`
`6`	`6`	`* Contract to create {@link ByteBuffer}s.`
`7`	`7`	`*`
`8`	`8`	`* @see NioParams`
`9`		`- * @since 5.5.0`
	`9`	`+ * @since 4.9.0`
`10`	`10`	`*/`
`11`	`11`	`public interface ByteBufferFactory {`
`12`	`12`