From 444123cdb4d581c06bd52bd5c329826c3426b562 Mon Sep 17 00:00:00 2001
From: Gary Russell <grussell@pivotal.io>
Date: Tue, 16 Oct 2018 15:19:38 -0400
Subject: [PATCH] GH-184: Don't declare queue if bindQueue is false

Resolves https://github.com/spring-cloud/spring-cloud-stream-binder-rabbit/issues/184

Resolves #185
---
 docs/src/main/asciidoc/overview.adoc               |  4 ++--
 .../RabbitExchangeQueueProvisioner.java            | 14 +++++++-------
 2 files changed, 9 insertions(+), 9 deletions(-)

diff --git a/docs/src/main/asciidoc/overview.adoc b/docs/src/main/asciidoc/overview.adoc
index 19f9d95ee..e4ce35b30 100644
--- a/docs/src/main/asciidoc/overview.adoc
+++ b/docs/src/main/asciidoc/overview.adoc
@@ -130,7 +130,7 @@ For partitioned destinations, `-<instanceIndex>` is appended.
 +
 Default: `#`.
 bindQueue::
-Whether to bind the queue to the destination exchange.
+Whether to declare the queue and bind it to the destination exchange.
 Set it to `false` if you have set up your own infrastructure and have previously created and bound the queue.
 +
 Default: `true`.
@@ -380,7 +380,7 @@ Only applies if `requiredGroups` are provided and then only to those groups.
 +
 Default: `#`.
 bindQueue::
-Whether to bind the queue to the destination exchange.
+Whether to declare the queue and bind it to the destination exchange.
 Set it to `false` if you have set up your own infrastructure and have previously created and bound the queue.
 Only applies if `requiredGroups` are provided and then only to those groups.
 +
diff --git a/spring-cloud-stream-binder-rabbit-core/src/main/java/org/springframework/cloud/stream/binder/rabbit/provisioning/RabbitExchangeQueueProvisioner.java b/spring-cloud-stream-binder-rabbit-core/src/main/java/org/springframework/cloud/stream/binder/rabbit/provisioning/RabbitExchangeQueueProvisioner.java
index 092eeee5d..c52f19ba5 100644
--- a/spring-cloud-stream-binder-rabbit-core/src/main/java/org/springframework/cloud/stream/binder/rabbit/provisioning/RabbitExchangeQueueProvisioner.java
+++ b/spring-cloud-stream-binder-rabbit-core/src/main/java/org/springframework/cloud/stream/binder/rabbit/provisioning/RabbitExchangeQueueProvisioner.java
@@ -101,11 +101,11 @@ public class RabbitExchangeQueueProvisioner implements ApplicationListener<Decla
 			String baseQueueName = producerProperties.getExtension().isQueueNameGroupOnly()
 					? requiredGroupName : (exchangeName + "." + requiredGroupName);
 			if (!producerProperties.isPartitioned()) {
-				Queue queue = new Queue(baseQueueName, true, false, false,
-						queueArgs(baseQueueName, producerProperties.getExtension(), false));
-				declareQueue(baseQueueName, queue);
 				autoBindDLQ(baseQueueName, baseQueueName, producerProperties.getExtension());
 				if (producerProperties.getExtension().isBindQueue()) {
+					Queue queue = new Queue(baseQueueName, true, false, false,
+							queueArgs(baseQueueName, producerProperties.getExtension(), false));
+					declareQueue(baseQueueName, queue);
 					binding = notPartitionedBinding(exchange, queue, producerProperties.getExtension());
 				}
 			}
@@ -114,11 +114,11 @@ public class RabbitExchangeQueueProvisioner implements ApplicationListener<Decla
 				for (int i = 0; i < producerProperties.getPartitionCount(); i++) {
 					String partitionSuffix = "-" + i;
 					String partitionQueueName = baseQueueName + partitionSuffix;
-					Queue queue = new Queue(partitionQueueName, true, false, false,
-							queueArgs(partitionQueueName, producerProperties.getExtension(), false));
-					declareQueue(queue.getName(), queue);
 					autoBindDLQ(baseQueueName, baseQueueName + partitionSuffix, producerProperties.getExtension());
 					if (producerProperties.getExtension().isBindQueue()) {
+						Queue queue = new Queue(partitionQueueName, true, false, false,
+								queueArgs(partitionQueueName, producerProperties.getExtension(), false));
+						declareQueue(queue.getName(), queue);
 						String prefix = producerProperties.getExtension().getPrefix();
 						String destination = StringUtils.isEmpty(prefix) ? exchangeName : exchangeName.substring(prefix.length());
 						binding = partitionedBinding(destination, exchange, queue, producerProperties.getExtension(), i);
@@ -180,9 +180,9 @@ public class RabbitExchangeQueueProvisioner implements ApplicationListener<Decla
 						queueArgs(queueName, properties.getExtension(), false));
 			}
 		}
-		declareQueue(queueName, queue);
 		Binding binding = null;
 		if (properties.getExtension().isBindQueue()) {
+			declareQueue(queueName, queue);
 			binding = declareConsumerBindings(name, properties, exchange, partitioned, queue);
 		}
 		if (durable) {