Merge pull request #23766 from garyrussell

* pr/23766:
  Polish "Add configuration options for RabbitMQ's batch listener config"
  Add configuration options for RabbitMQ's batch listener config

Closes gh-23766

Author: snicoll

spring-boot-project/spring-boot-autoconfigure/src/main/java/org/springframework/boot/autoconfigure/amqp/AbstractRabbitListenerContainerFactoryConfigurer.java

@@ -1,5 +1,5 @@
 /*
- * Copyright 2012-2019 the original author or authors.
+ * Copyright 2012-2020 the original author or authors.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -116,6 +116,7 @@ protected void configure(T factory, ConnectionFactory connectionFactory,
 			factory.setIdleEventInterval(configuration.getIdleEventInterval().toMillis());
 		}
 		factory.setMissingQueuesFatal(configuration.isMissingQueuesFatal());
+		factory.setDeBatchingEnabled(configuration.isDeBatchingEnabled());
 		ListenerRetry retryConfig = configuration.getRetry();
 		if (retryConfig.isEnabled()) {
 			RetryInterceptorBuilder<?, ?> builder = (retryConfig.isStateless()) ? RetryInterceptorBuilder.stateless()

spring-boot-project/spring-boot-autoconfigure/src/main/java/org/springframework/boot/autoconfigure/amqp/RabbitProperties.java

@@ -662,6 +662,12 @@ public abstract static class AmqpContainer {
 		 */
 		private Duration idleEventInterval;
 
+		/**
+		 * Whether the container should present batched messages as discrete messages or
+		 * call the listener with the batch.
+		 */
+		private boolean deBatchingEnabled = true;
+
 		/**
 		 * Optional properties for a retry interceptor.
 		 */
@@ -709,6 +715,14 @@ public void setIdleEventInterval(Duration idleEventInterval) {
 
 		public abstract boolean isMissingQueuesFatal();
 
+		public boolean isDeBatchingEnabled() {
+			return this.deBatchingEnabled;
+		}
+
+		public void setDeBatchingEnabled(boolean deBatchingEnabled) {
+			this.deBatchingEnabled = deBatchingEnabled;
+		}
+
 		public ListenerRetry getRetry() {
 			return this.retry;
 		}
@@ -743,6 +757,14 @@ public static class SimpleContainer extends AmqpContainer {
 		 */
 		private boolean missingQueuesFatal = true;
 
+		/**
+		 * Whether the container creates a batch of messages based on the
+		 * 'receive-timeout' and 'batch-size'. Coerces 'de-batching-enabled' to true to
+		 * include the contents of a producer created batch in the batch as discrete
+		 * records.
+		 */
+		private boolean consumerBatchEnabled;
+
 		public Integer getConcurrency() {
 			return this.concurrency;
 		}
@@ -776,6 +798,14 @@ public void setMissingQueuesFatal(boolean missingQueuesFatal) {
 			this.missingQueuesFatal = missingQueuesFatal;
 		}
 
+		public boolean isConsumerBatchEnabled() {
+			return this.consumerBatchEnabled;
+		}
+
+		public void setConsumerBatchEnabled(boolean consumerBatchEnabled) {
+			this.consumerBatchEnabled = consumerBatchEnabled;
+		}
+
 	}
 
 	/**

spring-boot-project/spring-boot-autoconfigure/src/main/java/org/springframework/boot/autoconfigure/amqp/SimpleRabbitListenerContainerFactoryConfigurer.java

@@ -1,5 +1,5 @@
 /*
- * Copyright 2012-2019 the original author or authors.
+ * Copyright 2012-2020 the original author or authors.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -39,6 +39,10 @@ public void configure(SimpleRabbitListenerContainerFactory factory, ConnectionFa
 		map.from(config::getConcurrency).whenNonNull().to(factory::setConcurrentConsumers);
 		map.from(config::getMaxConcurrency).whenNonNull().to(factory::setMaxConcurrentConsumers);
 		map.from(config::getBatchSize).whenNonNull().to(factory::setBatchSize);
+		map.from(config::isConsumerBatchEnabled).to(factory::setConsumerBatchEnabled);
+		if (config.isConsumerBatchEnabled()) {
+			factory.setDeBatchingEnabled(true);
+		}
 	}
 
 }

spring-boot-project/spring-boot-autoconfigure/src/test/java/org/springframework/boot/autoconfigure/amqp/RabbitAutoConfigurationTests.java

@@ -33,6 +33,8 @@
 import com.rabbitmq.client.impl.DefaultCredentialsProvider;
 import org.aopalliance.aop.Advice;
 import org.junit.jupiter.api.Test;
+import org.mockito.InOrder;
+import org.mockito.Mockito;
 
 import org.springframework.amqp.core.AcknowledgeMode;
 import org.springframework.amqp.core.AmqpAdmin;
@@ -550,19 +552,39 @@ void testSimpleRabbitListenerContainerFactoryConfigurerUsesConfig() {
 				});
 	}
 
+	@Test
+	void testSimpleRabbitListenerContainerFactoryConfigurerEnableDeBatchingWithConsumerBatchEnabled() {
+		this.contextRunner.withUserConfiguration(TestConfiguration.class)
+				.withPropertyValues("spring.rabbitmq.listener.type:direct",
+						"spring.rabbitmq.listener.simple.consumer-batch-enabled:true",
+						"spring.rabbitmq.listener.simple.de-batching-enabled:false")
+				.run((context) -> {
+					SimpleRabbitListenerContainerFactoryConfigurer configurer = context
+							.getBean(SimpleRabbitListenerContainerFactoryConfigurer.class);
+					SimpleRabbitListenerContainerFactory factory = mock(SimpleRabbitListenerContainerFactory.class);
+					configurer.configure(factory, mock(ConnectionFactory.class));
+					InOrder inOrder = Mockito.inOrder(factory);
+					verify(factory).setConsumerBatchEnabled(true);
+					inOrder.verify(factory).setDeBatchingEnabled(false);
+					inOrder.verify(factory).setDeBatchingEnabled(true);
+				});
+	}
+
 	@Test
 	void testDirectRabbitListenerContainerFactoryConfigurerUsesConfig() {
 		this.contextRunner.withUserConfiguration(TestConfiguration.class)
 				.withPropertyValues("spring.rabbitmq.listener.type:simple",
 						"spring.rabbitmq.listener.direct.consumers-per-queue:5",
-						"spring.rabbitmq.listener.direct.prefetch:40")
+						"spring.rabbitmq.listener.direct.prefetch:40",
+						"spring.rabbitmq.listener.direct.de-batching-enabled:false")
 				.run((context) -> {
 					DirectRabbitListenerContainerFactoryConfigurer configurer = context
 							.getBean(DirectRabbitListenerContainerFactoryConfigurer.class);
 					DirectRabbitListenerContainerFactory factory = mock(DirectRabbitListenerContainerFactory.class);
 					configurer.configure(factory, mock(ConnectionFactory.class));
 					verify(factory).setConsumersPerQueue(5);
 					verify(factory).setPrefetchCount(40);
+					verify(factory).setDeBatchingEnabled(false);
 				});
 	}
 

spring-boot-project/spring-boot-autoconfigure/src/test/java/org/springframework/boot/autoconfigure/amqp/RabbitPropertiesTests.java

@@ -303,6 +303,8 @@ void simpleContainerUseConsistentDefaultValues() {
 		RabbitProperties.SimpleContainer simple = this.properties.getListener().getSimple();
 		assertThat(simple.isAutoStartup()).isEqualTo(container.isAutoStartup());
 		assertThat(container).hasFieldOrPropertyWithValue("missingQueuesFatal", simple.isMissingQueuesFatal());
+		assertThat(container).hasFieldOrPropertyWithValue("deBatchingEnabled", simple.isDeBatchingEnabled());
+		assertThat(container).hasFieldOrPropertyWithValue("consumerBatchEnabled", simple.isConsumerBatchEnabled());
 	}
 
 	@Test
@@ -312,6 +314,7 @@ void directContainerUseConsistentDefaultValues() {
 		RabbitProperties.DirectContainer direct = this.properties.getListener().getDirect();
 		assertThat(direct.isAutoStartup()).isEqualTo(container.isAutoStartup());
 		assertThat(container).hasFieldOrPropertyWithValue("missingQueuesFatal", direct.isMissingQueuesFatal());
+		assertThat(container).hasFieldOrPropertyWithValue("deBatchingEnabled", direct.isDeBatchingEnabled());
 	}
 
 }