Commit 5cad11d6 authored by Phillip Webb's avatar Phillip Webb

Formatting

parent fd2e3b35
...@@ -34,8 +34,7 @@ import org.springframework.util.Assert; ...@@ -34,8 +34,7 @@ import org.springframework.util.Assert;
* @author Stephane Nicoll * @author Stephane Nicoll
* @since 2.0.0 * @since 2.0.0
*/ */
public abstract class AbstractRabbitListenerContainerFactoryConfigurer< public abstract class AbstractRabbitListenerContainerFactoryConfigurer<T extends AbstractRabbitListenerContainerFactory<?>> {
T extends AbstractRabbitListenerContainerFactory<?>> {
private MessageConverter messageConverter; private MessageConverter messageConverter;
...@@ -81,7 +80,6 @@ public abstract class AbstractRabbitListenerContainerFactoryConfigurer< ...@@ -81,7 +80,6 @@ public abstract class AbstractRabbitListenerContainerFactoryConfigurer<
*/ */
public abstract void configure(T factory, ConnectionFactory connectionFactory); public abstract void configure(T factory, ConnectionFactory connectionFactory);
protected void configure(T factory, ConnectionFactory connectionFactory, protected void configure(T factory, ConnectionFactory connectionFactory,
RabbitProperties.AmqpContainer configuration) { RabbitProperties.AmqpContainer configuration) {
Assert.notNull(factory, "Factory must not be null"); Assert.notNull(factory, "Factory must not be null");
......
...@@ -20,17 +20,19 @@ import org.springframework.amqp.rabbit.config.DirectRabbitListenerContainerFacto ...@@ -20,17 +20,19 @@ import org.springframework.amqp.rabbit.config.DirectRabbitListenerContainerFacto
import org.springframework.amqp.rabbit.connection.ConnectionFactory; import org.springframework.amqp.rabbit.connection.ConnectionFactory;
/** /**
* Configure {@link DirectRabbitListenerContainerFactoryConfigurer} with sensible defaults. * Configure {@link DirectRabbitListenerContainerFactoryConfigurer} with sensible
* defaults.
* *
* @author Gary Russell * @author Gary Russell
* @author Stephane Nicoll * @author Stephane Nicoll
* @since 2.0 * @since 2.0
*/ */
public final class DirectRabbitListenerContainerFactoryConfigurer public final class DirectRabbitListenerContainerFactoryConfigurer extends
extends AbstractRabbitListenerContainerFactoryConfigurer<DirectRabbitListenerContainerFactory> { AbstractRabbitListenerContainerFactoryConfigurer<DirectRabbitListenerContainerFactory> {
@Override @Override
public void configure(DirectRabbitListenerContainerFactory factory, ConnectionFactory connectionFactory) { public void configure(DirectRabbitListenerContainerFactory factory,
ConnectionFactory connectionFactory) {
RabbitProperties.DirectContainer config = getRabbitProperties().getListener() RabbitProperties.DirectContainer config = getRabbitProperties().getListener()
.getDirect(); .getDirect();
configure(factory, connectionFactory, config); configure(factory, connectionFactory, config);
......
...@@ -76,12 +76,10 @@ class RabbitAnnotationDrivenConfiguration { ...@@ -76,12 +76,10 @@ class RabbitAnnotationDrivenConfiguration {
return factory; return factory;
} }
@Bean @Bean
@ConditionalOnMissingBean @ConditionalOnMissingBean
public DirectRabbitListenerContainerFactoryConfigurer directRabbitListenerContainerFactoryConfigurer() { public DirectRabbitListenerContainerFactoryConfigurer directRabbitListenerContainerFactoryConfigurer() {
DirectRabbitListenerContainerFactoryConfigurer configurer = DirectRabbitListenerContainerFactoryConfigurer configurer = new DirectRabbitListenerContainerFactoryConfigurer();
new DirectRabbitListenerContainerFactoryConfigurer();
configurer.setMessageConverter(this.messageConverter.getIfUnique()); configurer.setMessageConverter(this.messageConverter.getIfUnique());
configurer.setMessageRecoverer(this.messageRecoverer.getIfUnique()); configurer.setMessageRecoverer(this.messageRecoverer.getIfUnique());
configurer.setRabbitProperties(this.properties); configurer.setRabbitProperties(this.properties);
......
...@@ -467,8 +467,8 @@ public class RabbitProperties { ...@@ -467,8 +467,8 @@ public class RabbitProperties {
public enum ContainerType { public enum ContainerType {
/** /**
* Legacy container where the RabbitMQ consumer dispatches messages to an * Legacy container where the RabbitMQ consumer dispatches messages to an invoker
* invoker thread. * thread.
*/ */
SIMPLE, SIMPLE,
...@@ -607,9 +607,8 @@ public class RabbitProperties { ...@@ -607,9 +607,8 @@ public class RabbitProperties {
private Integer maxConcurrency; private Integer maxConcurrency;
/** /**
* Number of messages to be processed in a transaction; number of messages * Number of messages to be processed in a transaction; number of messages between
* between acks. For best results it should * acks. For best results it should be less than or equal to the prefetch count.
* be less than or equal to the prefetch count.
*/ */
private Integer transactionSize; private Integer transactionSize;
......
...@@ -20,17 +20,19 @@ import org.springframework.amqp.rabbit.config.SimpleRabbitListenerContainerFacto ...@@ -20,17 +20,19 @@ import org.springframework.amqp.rabbit.config.SimpleRabbitListenerContainerFacto
import org.springframework.amqp.rabbit.connection.ConnectionFactory; import org.springframework.amqp.rabbit.connection.ConnectionFactory;
/** /**
* Configure {@link SimpleRabbitListenerContainerFactoryConfigurer} with sensible defaults. * Configure {@link SimpleRabbitListenerContainerFactoryConfigurer} with sensible
* defaults.
* *
* @author Stephane Nicoll * @author Stephane Nicoll
* @author Gary Russell * @author Gary Russell
* @since 1.3.3 * @since 1.3.3
*/ */
public final class SimpleRabbitListenerContainerFactoryConfigurer public final class SimpleRabbitListenerContainerFactoryConfigurer extends
extends AbstractRabbitListenerContainerFactoryConfigurer<SimpleRabbitListenerContainerFactory> { AbstractRabbitListenerContainerFactoryConfigurer<SimpleRabbitListenerContainerFactory> {
@Override @Override
public void configure(SimpleRabbitListenerContainerFactory factory, ConnectionFactory connectionFactory) { public void configure(SimpleRabbitListenerContainerFactory factory,
ConnectionFactory connectionFactory) {
RabbitProperties.SimpleContainer config = getRabbitProperties().getListener() RabbitProperties.SimpleContainer config = getRabbitProperties().getListener()
.getSimple(); .getSimple();
configure(factory, connectionFactory, config); configure(factory, connectionFactory, config);
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment