From 822317679a4cfd00012d9291e8edf1f72fb9ec30 Mon Sep 17 00:00:00 2001 From: Mark Fisher Date: Thu, 8 Jul 2010 14:57:50 -0700 Subject: [PATCH] AMQP-9 removed 'default' from names of template properties --- .../amqp/helloworld/RabbitConfiguration.java | 5 +++-- .../stocks/config/client/RabbitClientConfiguration.java | 6 +----- .../stocks/config/server/RabbitServerConfiguration.java | 2 +- 3 files changed, 5 insertions(+), 8 deletions(-) diff --git a/helloworld/src/main/java/org/springframework/amqp/helloworld/RabbitConfiguration.java b/helloworld/src/main/java/org/springframework/amqp/helloworld/RabbitConfiguration.java index 38e5b52..c0f5d6d 100644 --- a/helloworld/src/main/java/org/springframework/amqp/helloworld/RabbitConfiguration.java +++ b/helloworld/src/main/java/org/springframework/amqp/helloworld/RabbitConfiguration.java @@ -28,13 +28,14 @@ public class RabbitConfiguration extends AbstractRabbitConfiguration { public RabbitTemplate rabbitTemplate() { RabbitTemplate template = new RabbitTemplate(connectionFactory()); //The routing key is set to the name of the queue by the broker for the default exchange. - template.setDefaultRoutingKey(helloWorldQueue.getName()); + template.setRoutingKey(helloWorldQueue.getName()); //Where we will synchronously receive messages from - template.setDefaultReceiveQueue(helloWorldQueue); + template.setQueue(helloWorldQueue.getName()); return template; } @PostConstruct + @SuppressWarnings("unused") private void configureBroker() { declare(helloWorldQueue); } 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 66ef941..9b89dd7 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 @@ -16,13 +16,9 @@ package org.springframework.amqp.rabbit.stocks.config.client; -import javax.annotation.PostConstruct; import org.springframework.amqp.core.Binding; -import org.springframework.amqp.core.BindingBuilder; -import org.springframework.amqp.core.UniquelyNamedQueue; -import static org.springframework.amqp.core.BindingBuilder.*; import org.springframework.amqp.core.Queue; import org.springframework.amqp.rabbit.core.RabbitTemplate; import org.springframework.amqp.rabbit.listener.SimpleMessageListenerContainer; @@ -67,7 +63,7 @@ public class RabbitClientConfiguration extends AbstractStockAppRabbitConfigurati */ @Override public void configureRabbitTemplate(RabbitTemplate rabbitTemplate) { - rabbitTemplate.setDefaultRoutingKey(STOCK_REQUEST_QUEUE_NAME); + rabbitTemplate.setRoutingKey(STOCK_REQUEST_QUEUE_NAME); } @Bean diff --git a/stocks/src/main/java/org/springframework/amqp/rabbit/stocks/config/server/RabbitServerConfiguration.java b/stocks/src/main/java/org/springframework/amqp/rabbit/stocks/config/server/RabbitServerConfiguration.java index 3411349..3de9745 100644 --- a/stocks/src/main/java/org/springframework/amqp/rabbit/stocks/config/server/RabbitServerConfiguration.java +++ b/stocks/src/main/java/org/springframework/amqp/rabbit/stocks/config/server/RabbitServerConfiguration.java @@ -36,7 +36,7 @@ public class RabbitServerConfiguration extends AbstractStockAppRabbitConfigurati * {@link AbstractStockAppRabbitConfiguration#MARKET_DATA_EXCHANGE_NAME}. */ public void configureRabbitTemplate(RabbitTemplate rabbitTemplate) { - rabbitTemplate.setDefaultExchange(MARKET_DATA_EXCHANGE_NAME); + rabbitTemplate.setExchange(MARKET_DATA_EXCHANGE_NAME); } /**