Merge pull request #23799 from garyrussell

* pr/23799:
  Polish "Remove RabbitMQ AutoConfig Boolean Coercion"
  Remove RabbitMQ AutoConfig Boolean Coercion

Closes gh-23799

Author: snicoll

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

@@ -40,9 +40,6 @@ public void configure(SimpleRabbitListenerContainerFactory factory, ConnectionFa
 		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,8 +33,6 @@
 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;
@@ -556,17 +554,13 @@ void testSimpleRabbitListenerContainerFactoryConfigurerUsesConfig() {
 	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")
+						"spring.rabbitmq.listener.simple.consumer-batch-enabled:true")
 				.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);
 				});
 	}