From fd85cebfef08805e70149310358f3ee3ab94ec72 Mon Sep 17 00:00:00 2001
From: Stephane Nicoll <snicoll@pivotal.io>
Date: Mon, 30 Jul 2018 10:53:24 +0200
Subject: [PATCH] Polish "Make RabbitTemplate default receive queue
 configurable"

Closes gh-13930
---
 .../boot/autoconfigure/amqp/RabbitProperties.java           | 6 ++++--
 .../src/main/asciidoc/appendix-application-properties.adoc  | 2 +-
 2 files changed, 5 insertions(+), 3 deletions(-)

diff --git a/spring-boot-project/spring-boot-autoconfigure/src/main/java/org/springframework/boot/autoconfigure/amqp/RabbitProperties.java b/spring-boot-project/spring-boot-autoconfigure/src/main/java/org/springframework/boot/autoconfigure/amqp/RabbitProperties.java
index b0e057eb22b..02292ebeccb 100644
--- a/spring-boot-project/spring-boot-autoconfigure/src/main/java/org/springframework/boot/autoconfigure/amqp/RabbitProperties.java
+++ b/spring-boot-project/spring-boot-autoconfigure/src/main/java/org/springframework/boot/autoconfigure/amqp/RabbitProperties.java
@@ -715,7 +715,8 @@ public class RabbitProperties {
 		private String routingKey = "";
 
 		/**
-		 * Default queue name that will be used for synchronous receives.
+		 * Name of the default queue to receive messages from when none is specified
+		 * explicitly.
 		 */
 		private String queue;
 
@@ -764,12 +765,13 @@ public class RabbitProperties {
 		}
 
 		public String getQueue() {
-			return queue;
+			return this.queue;
 		}
 
 		public void setQueue(String queue) {
 			this.queue = queue;
 		}
+
 	}
 
 	public static class Retry {
diff --git a/spring-boot-project/spring-boot-docs/src/main/asciidoc/appendix-application-properties.adoc b/spring-boot-project/spring-boot-docs/src/main/asciidoc/appendix-application-properties.adoc
index 83cbfe4cdab..f870f4385ab 100644
--- a/spring-boot-project/spring-boot-docs/src/main/asciidoc/appendix-application-properties.adoc
+++ b/spring-boot-project/spring-boot-docs/src/main/asciidoc/appendix-application-properties.adoc
@@ -1158,6 +1158,7 @@ content into your application. Rather, pick only the properties that you need.
 	spring.rabbitmq.ssl.algorithm= # SSL algorithm to use. By default, configured by the Rabbit client library.
 	spring.rabbitmq.template.exchange= # Name of the default exchange to use for send operations.
 	spring.rabbitmq.template.mandatory= # Whether to enable mandatory messages.
+	spring.rabbitmq.template.queue= # Name of the default queue to receive messages from when none is specified explicitly.
 	spring.rabbitmq.template.receive-timeout= # Timeout for `receive()` operations.
 	spring.rabbitmq.template.reply-timeout= # Timeout for `sendAndReceive()` operations.
 	spring.rabbitmq.template.retry.enabled=false # Whether publishing retries are enabled.
@@ -1166,7 +1167,6 @@ content into your application. Rather, pick only the properties that you need.
 	spring.rabbitmq.template.retry.max-interval=10000ms # Maximum duration between attempts.
 	spring.rabbitmq.template.retry.multiplier=1 # Multiplier to apply to the previous retry interval.
 	spring.rabbitmq.template.routing-key= # Value of a default routing key to use for send operations.
-	spring.rabbitmq.template.queue= # Value of a default queue name that will be used for synchronous receives.
 	spring.rabbitmq.username=guest # Login user to authenticate to the broker.
 	spring.rabbitmq.virtual-host= # Virtual host to use when connecting to the broker.