Merge #168 into 1.5.4

Conflicts:
	build.gradle
	gradle.properties

Author: acogoluegnes

gradle.properties

@@ -1,2 +1,2 @@
 version=1.5.4-SNAPSHOT
-reactorCoreVersion=3.4.11-SNAPSHOT
+reactorCoreVersion=3.4.11-SNAPSHOT

src/main/java/reactor/rabbitmq/ConsumeOptions.java

@@ -18,6 +18,8 @@
 
 import com.rabbitmq.client.Channel;
 import com.rabbitmq.client.Delivery;
+import java.util.Collections;
+import java.util.Map;
 import reactor.core.publisher.FluxSink;
 
 import java.time.Duration;
@@ -60,6 +62,11 @@ public class ConsumeOptions {
     private Consumer<Channel> channelCallback = ch -> {
     };
 
+    /**
+     * Arguments for the call to <code>basic.consume</code>.
+     */
+    private Map<String, Object> arguments = Collections.emptyMap();
+
     public int getQos() {
         return qos;
     }
@@ -129,4 +136,13 @@ public ConsumeOptions channelCallback(Consumer<Channel> channelCallback) {
     public Consumer<Channel> getChannelCallback() {
         return channelCallback;
     }
+
+    public ConsumeOptions arguments(Map<String, Object> arguments) {
+        this.arguments = arguments;
+        return this;
+    }
+
+    public Map<String, Object> getArguments() {
+        return arguments;
+    }
 }

src/main/java/reactor/rabbitmq/Receiver.java

@@ -132,7 +132,15 @@ public Flux<Delivery> consumeNoAck(final String queue, ConsumeOptions options) {
 
                 completeOnChannelShutdown(channel, emitter);
 
-                final String consumerTag = channel.basicConsume(queue, true, options.getConsumerTag(), deliverCallback, cancelCallback);
+                final String consumerTag = channel.basicConsume(
+                    queue,
+                    true, // auto-ack
+                    options.getConsumerTag(),
+                    false, // noLocal (not supported by RabbitMQ)
+                    false, // not exclusive
+                    options.getArguments(),
+                    deliverCallback,
+                    cancelCallback);
                 AtomicBoolean cancelled = new AtomicBoolean(false);
                 LOGGER.info("Consumer {} consuming from {} has been registered", consumerTag, queue);
                 emitter.onDispose(() -> {
@@ -221,7 +229,15 @@ public Flux<AcknowledgableDelivery> consumeManualAck(final String queue, Consume
 
                 completeOnChannelShutdown(channel, emitter);
 
-                final String consumerTag = channel.basicConsume(queue, false, options.getConsumerTag(), deliverCallback, cancelCallback);
+                final String consumerTag = channel.basicConsume(
+                    queue,
+                    false, // no auto-ack
+                    options.getConsumerTag(),
+                    false, // noLocal (not supported by RabbitMQ)
+                    false, // not exclusive
+                    options.getArguments(),
+                    deliverCallback,
+                    cancelCallback);
                 AtomicBoolean cancelled = new AtomicBoolean(false);
                 LOGGER.info("Consumer {} consuming from {} has been registered", consumerTag, queue);
                 emitter.onDispose(() -> {

src/test/java/reactor/rabbitmq/ConnectionRecoveryTests.java

@@ -170,9 +170,16 @@ void consumeAutoAckRetryOnAck() throws Exception {
         AtomicReference<DeliverCallback> deliverCallbackAtomicReference = new AtomicReference<>();
 
         when(mockChannel.basicConsume(
-                anyString(), anyBoolean(), anyString(), any(DeliverCallback.class), any(CancelCallback.class)
+                anyString(), // queue
+                anyBoolean(), // auto-ack
+                anyString(), // consumer tag
+                anyBoolean(), // noLocal (always false)
+                anyBoolean(), // exclusive (always false)
+                anyMap(), // arguments
+                any(DeliverCallback.class),
+                any(CancelCallback.class)
         )).thenAnswer(answer -> {
-            deliverCallbackAtomicReference.set(answer.getArgument(3));
+            deliverCallbackAtomicReference.set(answer.getArgument(6));
             consumerRegisteredLatch.countDown();
             return "ctag";
         });
@@ -228,9 +235,16 @@ void consumeManualAckRetryOnAck() throws Exception {
         AtomicReference<DeliverCallback> deliverCallbackAtomicReference = new AtomicReference<>();
 
         when(mockChannel.basicConsume(
-                anyString(), anyBoolean(), anyString(), any(DeliverCallback.class), any(CancelCallback.class)
+            anyString(), // queue
+            anyBoolean(), // auto-ack
+            anyString(), // consumer tag
+            anyBoolean(), // noLocal (always false)
+            anyBoolean(), // exclusive (always false)
+            anyMap(), // arguments
+            any(DeliverCallback.class),
+            any(CancelCallback.class)
         )).thenAnswer(answer -> {
-            deliverCallbackAtomicReference.set(answer.getArgument(3));
+            deliverCallbackAtomicReference.set(answer.getArgument(6));
             consumerRegisteredLatch.countDown();
             return "ctag";
         });