From d8f4b2047bad5bc633a67b6c879e7c4fb0036711 Mon Sep 17 00:00:00 2001 From: Mark Fisher Date: Mon, 12 Jul 2010 10:59:05 -0400 Subject: [PATCH] replaced CachingConnectionFactory with SingleConnectionFactory for tests and samples --- .../springframework/amqp/helloworld/RabbitConfiguration.java | 4 ++-- .../amqp/helloworld/async/ProducerConfiguration.java | 4 ++-- .../stocks/config/AbstractStockAppRabbitConfiguration.java | 5 ++--- .../stocks/config/client/RabbitClientConfiguration.java | 3 +-- 4 files changed, 7 insertions(+), 9 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 4c21464..54fd10b 100644 --- a/helloworld/src/main/java/org/springframework/amqp/helloworld/RabbitConfiguration.java +++ b/helloworld/src/main/java/org/springframework/amqp/helloworld/RabbitConfiguration.java @@ -2,8 +2,8 @@ package org.springframework.amqp.helloworld; import org.springframework.amqp.core.Queue; import org.springframework.amqp.rabbit.config.AbstractRabbitConfiguration; -import org.springframework.amqp.rabbit.connection.CachingConnectionFactory; import org.springframework.amqp.rabbit.connection.ConnectionFactory; +import org.springframework.amqp.rabbit.connection.SingleConnectionFactory; import org.springframework.amqp.rabbit.core.RabbitTemplate; import org.springframework.context.annotation.Bean; import org.springframework.context.annotation.Configuration; @@ -15,7 +15,7 @@ public class RabbitConfiguration extends AbstractRabbitConfiguration { @Bean public ConnectionFactory connectionFactory() { - CachingConnectionFactory connectionFactory = new CachingConnectionFactory("localhost"); + SingleConnectionFactory connectionFactory = new SingleConnectionFactory("localhost"); connectionFactory.setUsername("guest"); connectionFactory.setPassword("guest"); return connectionFactory; diff --git a/helloworld/src/main/java/org/springframework/amqp/helloworld/async/ProducerConfiguration.java b/helloworld/src/main/java/org/springframework/amqp/helloworld/async/ProducerConfiguration.java index 3741f8d..52be209 100644 --- a/helloworld/src/main/java/org/springframework/amqp/helloworld/async/ProducerConfiguration.java +++ b/helloworld/src/main/java/org/springframework/amqp/helloworld/async/ProducerConfiguration.java @@ -4,8 +4,8 @@ import java.util.concurrent.atomic.AtomicInteger; import org.springframework.amqp.core.Queue; import org.springframework.amqp.rabbit.config.AbstractRabbitConfiguration; -import org.springframework.amqp.rabbit.connection.CachingConnectionFactory; import org.springframework.amqp.rabbit.connection.ConnectionFactory; +import org.springframework.amqp.rabbit.connection.SingleConnectionFactory; import org.springframework.amqp.rabbit.core.RabbitTemplate; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.beans.factory.config.BeanPostProcessor; @@ -29,7 +29,7 @@ public class ProducerConfiguration extends AbstractRabbitConfiguration { @Bean public ConnectionFactory connectionFactory() { - CachingConnectionFactory connectionFactory = new CachingConnectionFactory("localhost"); + SingleConnectionFactory connectionFactory = new SingleConnectionFactory("localhost"); connectionFactory.setUsername("guest"); connectionFactory.setPassword("guest"); return connectionFactory; diff --git a/stocks/src/main/java/org/springframework/amqp/rabbit/stocks/config/AbstractStockAppRabbitConfiguration.java b/stocks/src/main/java/org/springframework/amqp/rabbit/stocks/config/AbstractStockAppRabbitConfiguration.java index 3ca0ff1..d30e6a3 100644 --- a/stocks/src/main/java/org/springframework/amqp/rabbit/stocks/config/AbstractStockAppRabbitConfiguration.java +++ b/stocks/src/main/java/org/springframework/amqp/rabbit/stocks/config/AbstractStockAppRabbitConfiguration.java @@ -18,8 +18,8 @@ package org.springframework.amqp.rabbit.stocks.config; import org.springframework.amqp.core.TopicExchange; import org.springframework.amqp.rabbit.config.AbstractRabbitConfiguration; -import org.springframework.amqp.rabbit.connection.CachingConnectionFactory; import org.springframework.amqp.rabbit.connection.ConnectionFactory; +import org.springframework.amqp.rabbit.connection.SingleConnectionFactory; import org.springframework.amqp.rabbit.core.RabbitTemplate; import org.springframework.amqp.support.converter.JsonMessageConverter; import org.springframework.amqp.support.converter.MessageConverter; @@ -58,10 +58,9 @@ public abstract class AbstractStockAppRabbitConfiguration extends AbstractRabbit @Bean public ConnectionFactory connectionFactory() { //TODO make it possible to customize in subclasses. - CachingConnectionFactory connectionFactory = new CachingConnectionFactory("localhost"); + SingleConnectionFactory connectionFactory = new SingleConnectionFactory("localhost"); connectionFactory.setUsername("guest"); connectionFactory.setPassword("guest"); - connectionFactory.setChannelCacheSize(10); return connectionFactory; } 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 74bbe20..94596f8 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 @@ -78,10 +78,9 @@ public class RabbitClientConfiguration extends AbstractStockAppRabbitConfigurati public SimpleMessageListenerContainer messageListenerContainer() { SimpleMessageListenerContainer container = new SimpleMessageListenerContainer(connectionFactory()); container.setQueues(marketDataQueue(), traderJoeQueue()); - //container.setConcurrentConsumers(5); // note, now set to size of channel cache in CachingConnectionFactory by default container.setMessageListener(messageListenerAdapter()); return container; - + //container(using(connectionFactory()).listenToQueues(marketDataQueue(), traderJoeQueue()).withListener(messageListenerAdapter()). }