GH-1412: Fix Messaging Template

* GH-1412: Fix Messaging Template

Resolves #1412

The use of the `defaultDestination` is not correct when the template is
used for both sends and receives because it is a queue name for receives
and a routing key for sends.

Add a new option to use the template's configured default receive queue
for receive only methods. False by default to avoid a breaking change;
it should be true by default in a future release.

* Fix Javadocs

**cherry-pick to 2.3.x, 2.2.x**

Author: garyrussell

spring-rabbit/src/main/java/org/springframework/amqp/rabbit/core/RabbitMessagingTemplate.java

@@ -1,5 +1,5 @@
 /*
- * Copyright 2002-2020 the original author or authors.
+ * Copyright 2002-2022 the original author or authors.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -48,6 +48,8 @@ public class RabbitMessagingTemplate extends AbstractMessagingTemplate<String>
 
 	private boolean converterSet;
 
+	private boolean useTemplateDefaultReceiveQueue;
+
 
 	/**
 	 * Constructor for use with bean properties.
@@ -71,6 +73,7 @@ public RabbitMessagingTemplate(RabbitTemplate rabbitTemplate) {
 	 * @param rabbitTemplate the template.
 	 */
 	public void setRabbitTemplate(RabbitTemplate rabbitTemplate) {
+		Assert.notNull(rabbitTemplate, "'rabbitTemplate' must not be null");
 		this.rabbitTemplate = rabbitTemplate;
 	}
 
@@ -107,6 +110,18 @@ public MessageConverter getAmqpMessageConverter() {
 		return this.amqpMessageConverter;
 	}
 
+	/**
+	 * When true, use the underlying {@link RabbitTemplate}'s defaultReceiveQueue property
+	 * (if configured) for receive only methods instead of the {@code defaultDestination}
+	 * configured in this template. Set this to true to use the template's queue instead.
+	 * Default false, but will be true in a future release.
+	 * @param useTemplateDefaultReceiveQueue true to use the template's queue.
+	 * @since 2.2.22
+	 */
+	public void setUseTemplateDefaultReceiveQueue(boolean useTemplateDefaultReceiveQueue) {
+		this.useTemplateDefaultReceiveQueue = useTemplateDefaultReceiveQueue;
+	}
+
 	@Override
 	public void afterPropertiesSet() {
 		Assert.notNull(getRabbitTemplate(), "Property 'rabbitTemplate' is required");
@@ -225,6 +240,28 @@ protected void doSend(String exchange, String routingKey, Message<?> message) {
 		}
 	}
 
+	@Override
+	@Nullable
+	public Message<?> receive() {
+		return doReceive(resolveDestination());
+	}
+
+	@Override
+	@Nullable
+	public <T> T receiveAndConvert(Class<T> targetClass) {
+		return receiveAndConvert(resolveDestination(), targetClass);
+	}
+
+	private String resolveDestination() {
+		String dest = null;
+		if (this.useTemplateDefaultReceiveQueue) {
+			dest = this.rabbitTemplate.getDefaultReceiveQueue();
+		}
+		if (dest == null) {
+			dest = getRequiredDefaultDestination();
+		}
+		return dest;
+	}
 
 	@Override
 	protected Message<?> doReceive(String destination) {

spring-rabbit/src/main/java/org/springframework/amqp/rabbit/core/RabbitTemplate.java

@@ -1,5 +1,5 @@
 /*
- * Copyright 2002-2021 the original author or authors.
+ * Copyright 2002-2022 the original author or authors.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -348,6 +348,16 @@ public void setDefaultReceiveQueue(String queue) {
 		this.defaultReceiveQueue = queue;
 	}
 
+	/**
+	 * Return the configured default receive queue.
+	 * @return the queue or null if not configured.
+	 * @since 2.2.22
+	 */
+	@Nullable
+	public String getDefaultReceiveQueue() {
+		return this.defaultReceiveQueue;
+	}
+
 	/**
 	 * The encoding to use when converting between byte arrays and Strings in message properties.
 	 *

spring-rabbit/src/test/java/org/springframework/amqp/rabbit/core/RabbitMessagingTemplateTests.java

@@ -1,5 +1,5 @@
 /*
- * Copyright 2002-2020 the original author or authors.
+ * Copyright 2002-2022 the original author or authors.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -256,6 +256,20 @@ public void receiveDefaultDestination() {
 		assertTextMessage(message);
 	}
 
+	@Test
+	public void receiveDefaultDestinationOverride() {
+		messagingTemplate.setDefaultDestination("defaultDest");
+		messagingTemplate.setUseTemplateDefaultReceiveQueue(true);
+
+		org.springframework.amqp.core.Message amqpMsg = createAmqpTextMessage();
+		given(rabbitTemplate.getDefaultReceiveQueue()).willReturn("default");
+		given(rabbitTemplate.receive("default")).willReturn(amqpMsg);
+
+		Message<?> message = messagingTemplate.receive();
+		verify(rabbitTemplate).receive("default");
+		assertTextMessage(message);
+	}
+
 	@Test
 	public void receiveNoDefaultSet() {
 		assertThatIllegalStateException()