From 1bbc11bfb6612efa7fa305b5ae2304622d54e7b3 Mon Sep 17 00:00:00 2001
From: Dave Syer <dsyer@vmware.com>
Date: Thu, 24 Mar 2011 15:14:58 +0000
Subject: [PATCH] Fix client to use an address, not a Queue for replyTo

---
 .../config/client/RabbitClientConfiguration.java    |  2 +-
 .../stocks/gateway/RabbitStockServiceGateway.java   | 13 ++++---------
 .../src/main/resources/client-bootstrap-config.xml  |  3 ++-
 stocks/src/main/resources/client-messaging.xml      |  2 +-
 stocks/src/main/resources/servlet-config.xml        |  2 +-
 5 files changed, 9 insertions(+), 13 deletions(-)

diff --git a/stocks/src/main/java/org/springframework/amqp/rabbit/stocks/config/client/RabbitClientConfiguration.java b/stocks/src/main/java/org/springframework/amqp/rabbit/stocks/config/client/RabbitClientConfiguration.java
index 0d73576..7ad8b28 100644
--- a/stocks/src/main/java/org/springframework/amqp/rabbit/stocks/config/client/RabbitClientConfiguration.java
+++ b/stocks/src/main/java/org/springframework/amqp/rabbit/stocks/config/client/RabbitClientConfiguration.java
@@ -70,7 +70,7 @@ public class RabbitClientConfiguration extends AbstractStockAppRabbitConfigurati
 	public StockServiceGateway stockServiceGateway() {
 		RabbitStockServiceGateway gateway = new RabbitStockServiceGateway();
 		gateway.setRabbitTemplate(rabbitTemplate());
-		gateway.setDefaultReplyToQueue(traderJoeQueue());
+		gateway.setDefaultReplyTo(traderJoeQueue().getName());
 		return gateway;
 	}
 
diff --git a/stocks/src/main/java/org/springframework/amqp/rabbit/stocks/gateway/RabbitStockServiceGateway.java b/stocks/src/main/java/org/springframework/amqp/rabbit/stocks/gateway/RabbitStockServiceGateway.java
index 6ac673a..5b5058a 100644
--- a/stocks/src/main/java/org/springframework/amqp/rabbit/stocks/gateway/RabbitStockServiceGateway.java
+++ b/stocks/src/main/java/org/springframework/amqp/rabbit/stocks/gateway/RabbitStockServiceGateway.java
@@ -23,7 +23,6 @@ import org.springframework.amqp.AmqpException;
 import org.springframework.amqp.core.Address;
 import org.springframework.amqp.core.Message;
 import org.springframework.amqp.core.MessagePostProcessor;
-import org.springframework.amqp.core.Queue;
 import org.springframework.amqp.rabbit.core.support.RabbitGatewaySupport;
 import org.springframework.amqp.rabbit.stocks.domain.TradeRequest;
 
@@ -34,20 +33,16 @@ import org.springframework.amqp.rabbit.stocks.domain.TradeRequest;
  */
 public class RabbitStockServiceGateway extends RabbitGatewaySupport implements StockServiceGateway {
 
-	private String defaultReplyToQueue;
+	private String defaultReplyTo;
 	
-	public void setDefaultReplyToQueue(String defaultReplyToQueue) {
-		this.defaultReplyToQueue = defaultReplyToQueue;
+	public void setDefaultReplyTo(String defaultReplyTo) {
+		this.defaultReplyTo = defaultReplyTo;
 	}
 	
-	public void setDefaultReplyToQueue(Queue defaultReplyToQueue) {
-		this.defaultReplyToQueue = defaultReplyToQueue.getName();
-	}
-
 	public void send(TradeRequest tradeRequest) {
 		getRabbitTemplate().convertAndSend(tradeRequest, new MessagePostProcessor() {
 			public Message postProcessMessage(Message message) throws AmqpException {
-				message.getMessageProperties().setReplyTo(new Address(defaultReplyToQueue));
+				message.getMessageProperties().setReplyTo(new Address(defaultReplyTo));
 				try {
 					message.getMessageProperties().setCorrelationId(UUID.randomUUID().toString().getBytes("UTF-8"));
 				}
diff --git a/stocks/src/main/resources/client-bootstrap-config.xml b/stocks/src/main/resources/client-bootstrap-config.xml
index c8926db..bce686d 100644
--- a/stocks/src/main/resources/client-bootstrap-config.xml
+++ b/stocks/src/main/resources/client-bootstrap-config.xml
@@ -12,6 +12,7 @@
 
 	<import resource="classpath:client-handlers.xml" />
 
-	<import resource="classpath:client-messaging.xml" />
+	<!-- XML version of RabbitClientConfiguration -->
+	<!-- import resource="classpath:client-messaging.xml" /-->
 
 </beans>
diff --git a/stocks/src/main/resources/client-messaging.xml b/stocks/src/main/resources/client-messaging.xml
index effad33..2e7bbd2 100644
--- a/stocks/src/main/resources/client-messaging.xml
+++ b/stocks/src/main/resources/client-messaging.xml
@@ -6,7 +6,7 @@
 
 	<bean id="stockServiceGateway" class="org.springframework.amqp.rabbit.stocks.gateway.RabbitStockServiceGateway">
 		<property name="rabbitTemplate" ref="rabbitTemplate" />
-	    <property name="defaultReplyToQueue" value="#{traderJoeQueue.name}" />
+	    <property name="defaultReplyTo" value="#{traderJoeQueue.name}" />
 	</bean>
 
 	<listener-container concurrency="5" connection-factory="connectionFactory" message-converter="jsonMessageConverter"
diff --git a/stocks/src/main/resources/servlet-config.xml b/stocks/src/main/resources/servlet-config.xml
index bea9264..be2b2f0 100644
--- a/stocks/src/main/resources/servlet-config.xml
+++ b/stocks/src/main/resources/servlet-config.xml
@@ -15,7 +15,7 @@
 				<property name="messageConverter" ref="jsonMessageConverter" />
 			</bean>
 		</property>
-		<property name="defaultReplyToQueue" ref="tradeQueue" />
+		<property name="defaultReplyTo" value="fanout://broadcast.responses/" />
 	</bean>
 
 	<rabbit:queue id="tradeQueue" />