diff --git a/spring-boot-autoconfigure/src/main/java/org/springframework/boot/autoconfigure/amqp/AbstractRabbitListenerContainerFactoryConfigurer.java b/spring-boot-autoconfigure/src/main/java/org/springframework/boot/autoconfigure/amqp/AbstractRabbitListenerContainerFactoryConfigurer.java index cedc264253..88283fa62f 100644 --- a/spring-boot-autoconfigure/src/main/java/org/springframework/boot/autoconfigure/amqp/AbstractRabbitListenerContainerFactoryConfigurer.java +++ b/spring-boot-autoconfigure/src/main/java/org/springframework/boot/autoconfigure/amqp/AbstractRabbitListenerContainerFactoryConfigurer.java @@ -34,8 +34,7 @@ import org.springframework.util.Assert; * @author Stephane Nicoll * @since 2.0.0 */ -public abstract class AbstractRabbitListenerContainerFactoryConfigurer< - T extends AbstractRabbitListenerContainerFactory> { +public abstract class AbstractRabbitListenerContainerFactoryConfigurer> { private MessageConverter messageConverter; @@ -81,7 +80,6 @@ public abstract class AbstractRabbitListenerContainerFactoryConfigurer< */ public abstract void configure(T factory, ConnectionFactory connectionFactory); - protected void configure(T factory, ConnectionFactory connectionFactory, RabbitProperties.AmqpContainer configuration) { Assert.notNull(factory, "Factory must not be null"); diff --git a/spring-boot-autoconfigure/src/main/java/org/springframework/boot/autoconfigure/amqp/DirectRabbitListenerContainerFactoryConfigurer.java b/spring-boot-autoconfigure/src/main/java/org/springframework/boot/autoconfigure/amqp/DirectRabbitListenerContainerFactoryConfigurer.java index 07879468dc..82af8d91d5 100644 --- a/spring-boot-autoconfigure/src/main/java/org/springframework/boot/autoconfigure/amqp/DirectRabbitListenerContainerFactoryConfigurer.java +++ b/spring-boot-autoconfigure/src/main/java/org/springframework/boot/autoconfigure/amqp/DirectRabbitListenerContainerFactoryConfigurer.java @@ -20,17 +20,19 @@ import org.springframework.amqp.rabbit.config.DirectRabbitListenerContainerFacto import org.springframework.amqp.rabbit.connection.ConnectionFactory; /** - * Configure {@link DirectRabbitListenerContainerFactoryConfigurer} with sensible defaults. + * Configure {@link DirectRabbitListenerContainerFactoryConfigurer} with sensible + * defaults. * * @author Gary Russell * @author Stephane Nicoll * @since 2.0 */ -public final class DirectRabbitListenerContainerFactoryConfigurer - extends AbstractRabbitListenerContainerFactoryConfigurer { +public final class DirectRabbitListenerContainerFactoryConfigurer extends + AbstractRabbitListenerContainerFactoryConfigurer { @Override - public void configure(DirectRabbitListenerContainerFactory factory, ConnectionFactory connectionFactory) { + public void configure(DirectRabbitListenerContainerFactory factory, + ConnectionFactory connectionFactory) { RabbitProperties.DirectContainer config = getRabbitProperties().getListener() .getDirect(); configure(factory, connectionFactory, config); diff --git a/spring-boot-autoconfigure/src/main/java/org/springframework/boot/autoconfigure/amqp/RabbitAnnotationDrivenConfiguration.java b/spring-boot-autoconfigure/src/main/java/org/springframework/boot/autoconfigure/amqp/RabbitAnnotationDrivenConfiguration.java index 7da43ccf28..6cafd04f93 100644 --- a/spring-boot-autoconfigure/src/main/java/org/springframework/boot/autoconfigure/amqp/RabbitAnnotationDrivenConfiguration.java +++ b/spring-boot-autoconfigure/src/main/java/org/springframework/boot/autoconfigure/amqp/RabbitAnnotationDrivenConfiguration.java @@ -76,12 +76,10 @@ class RabbitAnnotationDrivenConfiguration { return factory; } - @Bean @ConditionalOnMissingBean public DirectRabbitListenerContainerFactoryConfigurer directRabbitListenerContainerFactoryConfigurer() { - DirectRabbitListenerContainerFactoryConfigurer configurer = - new DirectRabbitListenerContainerFactoryConfigurer(); + DirectRabbitListenerContainerFactoryConfigurer configurer = new DirectRabbitListenerContainerFactoryConfigurer(); configurer.setMessageConverter(this.messageConverter.getIfUnique()); configurer.setMessageRecoverer(this.messageRecoverer.getIfUnique()); configurer.setRabbitProperties(this.properties); diff --git a/spring-boot-autoconfigure/src/main/java/org/springframework/boot/autoconfigure/amqp/RabbitProperties.java b/spring-boot-autoconfigure/src/main/java/org/springframework/boot/autoconfigure/amqp/RabbitProperties.java index d2d0eb30db..43efb00c90 100644 --- a/spring-boot-autoconfigure/src/main/java/org/springframework/boot/autoconfigure/amqp/RabbitProperties.java +++ b/spring-boot-autoconfigure/src/main/java/org/springframework/boot/autoconfigure/amqp/RabbitProperties.java @@ -467,8 +467,8 @@ public class RabbitProperties { public enum ContainerType { /** - * Legacy container where the RabbitMQ consumer dispatches messages to an - * invoker thread. + * Legacy container where the RabbitMQ consumer dispatches messages to an invoker + * thread. */ SIMPLE, @@ -607,9 +607,8 @@ public class RabbitProperties { private Integer maxConcurrency; /** - * Number of messages to be processed in a transaction; number of messages - * between acks. For best results it should - * be less than or equal to the prefetch count. + * Number of messages to be processed in a transaction; number of messages between + * acks. For best results it should be less than or equal to the prefetch count. */ private Integer transactionSize; diff --git a/spring-boot-autoconfigure/src/main/java/org/springframework/boot/autoconfigure/amqp/SimpleRabbitListenerContainerFactoryConfigurer.java b/spring-boot-autoconfigure/src/main/java/org/springframework/boot/autoconfigure/amqp/SimpleRabbitListenerContainerFactoryConfigurer.java index a31db8b094..bf076c8bd6 100644 --- a/spring-boot-autoconfigure/src/main/java/org/springframework/boot/autoconfigure/amqp/SimpleRabbitListenerContainerFactoryConfigurer.java +++ b/spring-boot-autoconfigure/src/main/java/org/springframework/boot/autoconfigure/amqp/SimpleRabbitListenerContainerFactoryConfigurer.java @@ -20,17 +20,19 @@ import org.springframework.amqp.rabbit.config.SimpleRabbitListenerContainerFacto import org.springframework.amqp.rabbit.connection.ConnectionFactory; /** - * Configure {@link SimpleRabbitListenerContainerFactoryConfigurer} with sensible defaults. + * Configure {@link SimpleRabbitListenerContainerFactoryConfigurer} with sensible + * defaults. * * @author Stephane Nicoll * @author Gary Russell * @since 1.3.3 */ -public final class SimpleRabbitListenerContainerFactoryConfigurer - extends AbstractRabbitListenerContainerFactoryConfigurer { +public final class SimpleRabbitListenerContainerFactoryConfigurer extends + AbstractRabbitListenerContainerFactoryConfigurer { @Override - public void configure(SimpleRabbitListenerContainerFactory factory, ConnectionFactory connectionFactory) { + public void configure(SimpleRabbitListenerContainerFactory factory, + ConnectionFactory connectionFactory) { RabbitProperties.SimpleContainer config = getRabbitProperties().getListener() .getSimple(); configure(factory, connectionFactory, config);