root
/
spring-boot
mirror of https://github.com/spring-projects/spring-boot.git
1
0
Fork 0
Code Issues Actions 15 Packages Projects Releases Wiki Activity

Formatting

This commit is contained in:
Phillip Webb 2017-05-09 21:59:59 -07:00
parent fd2e3b3505
commit 5cad11d6d2
5 changed files with 18 additions and 19 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
spring-boot-autoconfigure/src/main/java/org/springframework/boot/autoconfigure/amqp/AbstractRabbitListenerContainerFactoryConfigurer.java
View File

@ -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<T extends AbstractRabbitListenerContainerFactory<?>> {
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");

10
spring-boot-autoconfigure/src/main/java/org/springframework/boot/autoconfigure/amqp/DirectRabbitListenerContainerFactoryConfigurer.java
View File

@ -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<DirectRabbitListenerContainerFactory> {
public final class DirectRabbitListenerContainerFactoryConfigurer extends
AbstractRabbitListenerContainerFactoryConfigurer<DirectRabbitListenerContainerFactory> {
@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);

4
spring-boot-autoconfigure/src/main/java/org/springframework/boot/autoconfigure/amqp/RabbitAnnotationDrivenConfiguration.java
View File

@ -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);

9
spring-boot-autoconfigure/src/main/java/org/springframework/boot/autoconfigure/amqp/RabbitProperties.java
View File

@ -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;

10
spring-boot-autoconfigure/src/main/java/org/springframework/boot/autoconfigure/amqp/SimpleRabbitListenerContainerFactoryConfigurer.java
View File

@ -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<SimpleRabbitListenerContainerFactory> {
public final class SimpleRabbitListenerContainerFactoryConfigurer extends
AbstractRabbitListenerContainerFactoryConfigurer<SimpleRabbitListenerContainerFactory> {
@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);