Polish "Adjust to changes in Spring AMQP 2.2 snapshots"

See gh-17587

Author: snicoll

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

@@ -663,8 +663,8 @@ public static class SimpleContainer extends AmqpContainer {
 		private Integer maxConcurrency;
 
 		/**
-		 * Number of messages to be processed between acks when the acknowledge mode is
-		 * AUTO. If larger than prefetch, prefetch will be increased to this value.
+		 * Batch size, expressed as the number of physical messages, to be used by the
+		 * container.
 		 */
 		private Integer batchSize;
 
@@ -692,19 +692,19 @@ public void setMaxConcurrency(Integer maxConcurrency) {
 		}
 
 		/**
-		 * Get the number of messages processed in one transaction.
-		 * @return number of messages
+		 * Return the number of messages processed in one transaction.
+		 * @return the number of messages
 		 * @deprecated since 2.2.0 in favor of {@link SimpleContainer#getBatchSize()}
 		 */
-		@DeprecatedConfigurationProperty(replacement = "spring.rabbitmq.listener.simple.batchSize")
+		@DeprecatedConfigurationProperty(replacement = "spring.rabbitmq.listener.simple.batch-size")
 		@Deprecated
 		public Integer getTransactionSize() {
 			return getBatchSize();
 		}
 
 		/**
 		 * Set the number of messages processed in one transaction.
-		 * @param transactionSize number of messages
+		 * @param transactionSize the number of messages
 		 * @deprecated since 2.2.0 in favor of
 		 * {@link SimpleContainer#setBatchSize(Integer)}
 		 */

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

@@ -403,6 +403,7 @@ void testSimpleRabbitListenerContainerFactoryWithCustomSettings() {
 	}
 
 	@Test
+	@Deprecated
 	void testRabbitListenerContainerFactoryWithDeprecatedTransactionSizeStillWorks() {
 		this.contextRunner
 				.withUserConfiguration(MessageConvertersConfiguration.class, MessageRecoverersConfiguration.class)