From 354ec29608cdb987ee3d548aea2f9adea55098f0 Mon Sep 17 00:00:00 2001
From: Gary Russell <grussell@pivotal.io>
Date: Tue, 11 Dec 2018 14:20:30 -0500
Subject: [PATCH] GH-189 Support binding anon to built-in exchange

Fixes https://github.com/spring-cloud/spring-cloud-stream-binder-rabbit/issues/189

`queueNameGroupOnly` does not work with anonymous groups.

* Polishing - PR Comments

**Cherry-pick to 2.0.x**
---
 .../RabbitExchangeQueueProvisioner.java       | 15 ++++++++++-----
 .../binder/rabbit/RabbitBinderTests.java      | 19 +++++++++++++++++++
 2 files changed, 29 insertions(+), 5 deletions(-)

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 c52f19ba5..15a8b0898 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
@@ -24,7 +24,7 @@ import org.apache.commons.logging.Log;
 import org.apache.commons.logging.LogFactory;
 
 import org.springframework.amqp.AmqpConnectException;
-import org.springframework.amqp.core.AnonymousQueue;
+import org.springframework.amqp.core.Base64UrlNamingStrategy;
 import org.springframework.amqp.core.Binding;
 import org.springframework.amqp.core.Binding.DestinationType;
 import org.springframework.amqp.core.BindingBuilder;
@@ -64,8 +64,8 @@ public class RabbitExchangeQueueProvisioner implements ApplicationListener<Decla
 		ProvisioningProvider<ExtendedConsumerProperties<RabbitConsumerProperties>,
 							ExtendedProducerProperties<RabbitProducerProperties>> {
 
-	private static final AnonymousQueue.Base64UrlNamingStrategy ANONYMOUS_GROUP_NAME_GENERATOR
-			= new AnonymousQueue.Base64UrlNamingStrategy("anonymous.");
+	private static final Base64UrlNamingStrategy ANONYMOUS_GROUP_NAME_GENERATOR
+			= new Base64UrlNamingStrategy("anonymous.");
 
 	/**
 	 * The delimiter between a group and index when constructing a binder
@@ -148,8 +148,13 @@ public class RabbitExchangeQueueProvisioner implements ApplicationListener<Decla
 	private ConsumerDestination doProvisionConsumerDestination(String name, String group,
 			ExtendedConsumerProperties<RabbitConsumerProperties> properties) {
 		boolean anonymous = !StringUtils.hasText(group);
-		String  baseQueueName = anonymous ? groupedName(name, ANONYMOUS_GROUP_NAME_GENERATOR.generateName())
-					: properties.getExtension().isQueueNameGroupOnly() ? group : groupedName(name, group);
+		String  baseQueueName;
+		if (properties.getExtension().isQueueNameGroupOnly()) {
+				baseQueueName =  anonymous ? ANONYMOUS_GROUP_NAME_GENERATOR.generateName() : group;
+		}
+		else {
+				baseQueueName = groupedName(name, anonymous ? ANONYMOUS_GROUP_NAME_GENERATOR.generateName() : group);
+		}
 		if (this.logger.isInfoEnabled()) {
 			this.logger.info("declaring queue for inbound: " + baseQueueName + ", bound to: " + name);
 		}
diff --git a/spring-cloud-stream-binder-rabbit/src/test/java/org/springframework/cloud/stream/binder/rabbit/RabbitBinderTests.java b/spring-cloud-stream-binder-rabbit/src/test/java/org/springframework/cloud/stream/binder/rabbit/RabbitBinderTests.java
index 8c8c7cba4..446042699 100644
--- a/spring-cloud-stream-binder-rabbit/src/test/java/org/springframework/cloud/stream/binder/rabbit/RabbitBinderTests.java
+++ b/spring-cloud-stream-binder-rabbit/src/test/java/org/springframework/cloud/stream/binder/rabbit/RabbitBinderTests.java
@@ -391,6 +391,25 @@ public class RabbitBinderTests extends
 		assertThat(bindings.size()).isEqualTo(1);
 	}
 
+	@Test
+	public void testAnonWithBuiltInExchange() throws Exception {
+		RabbitTestBinder binder = getBinder();
+		ExtendedConsumerProperties<RabbitConsumerProperties> properties = createConsumerProperties();
+		properties.getExtension().setDeclareExchange(false);
+		properties.getExtension().setQueueNameGroupOnly(true);
+
+		Binding<MessageChannel> consumerBinding = binder.bindConsumer("amq.topic", null,
+				createBindableChannel("input", new BindingProperties()), properties);
+		Lifecycle endpoint = extractEndpoint(consumerBinding);
+		SimpleMessageListenerContainer container = TestUtils.getPropertyValue(endpoint, "messageListenerContainer",
+				SimpleMessageListenerContainer.class);
+		String queueName = container.getQueueNames()[0];
+		assertThat(queueName).startsWith("anonymous.");
+		assertThat(container.isRunning()).isTrue();
+		consumerBinding.unbind();
+		assertThat(container.isRunning()).isFalse();
+	}
+
 	@Test
 	public void testConsumerPropertiesWithUserInfrastructureCustomExchangeAndRK() throws Exception {
 		RabbitTestBinder binder = getBinder();