Polish "Add support for configuring non-standard JMS acknowledge modes"

See spring-projectsgh-37576

Author: wilkinsona

spring-boot-project/spring-boot-autoconfigure/src/main/java/org/springframework/boot/autoconfigure/jms/JmsAutoConfiguration.java

@@ -90,8 +90,8 @@ public JmsTemplate jmsTemplate(ConnectionFactory connectionFactory) {
 		private void mapTemplateProperties(Template properties, JmsTemplate template) {
 			PropertyMapper map = PropertyMapper.get().alwaysApplyingWhenNonNull();
 			map.from(properties.getSession()::getAcknowledgeMode)
-				.to((acknowledgeMode) -> template
-					.setSessionAcknowledgeMode(JmsAcknowledgeModeMapper.map(acknowledgeMode)));
+				.as(JmsAcknowledgeModeMapper::map)
+				.to(template::setSessionAcknowledgeMode);
 			map.from(properties.getSession()::isTransacted).to(template::setSessionTransacted);
 			map.from(properties::getDefaultDestination).whenNonNull().to(template::setDefaultDestinationName);
 			map.from(properties::getDeliveryDelay).whenNonNull().as(Duration::toMillis).to(template::setDeliveryDelay);

spring-boot-project/spring-boot-autoconfigure/src/test/java/org/springframework/boot/autoconfigure/jms/JmsAcknowledgeModeMapperTests.java

@@ -0,0 +1,89 @@
+/*
+ * Copyright 2012-2023 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.
+ * You may obtain a copy of the License at
+ *
+ *      https://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
+package org.springframework.boot.autoconfigure.jms;
+
+import jakarta.jms.Session;
+import org.junit.jupiter.api.Test;
+import org.junit.jupiter.params.ParameterizedTest;
+import org.junit.jupiter.params.provider.EnumSource;
+
+import org.springframework.boot.context.properties.source.InvalidConfigurationPropertyValueException;
+
+import static org.assertj.core.api.Assertions.assertThat;
+import static org.assertj.core.api.Assertions.assertThatExceptionOfType;
+
+/**
+ * Tests for {@link JmsAcknowledgeModeMapper}.
+ *
+ * @author Andy Wilkinson
+ */
+class JmsAcknowledgeModeMapperTests {
+
+	@ParameterizedTest
+	@EnumSource(Mapping.class)
+	void stringIsMappedToInt(Mapping mapping) {
+		assertThat(JmsAcknowledgeModeMapper.map(mapping.actual)).isEqualTo(mapping.expected);
+	}
+
+	@Test
+	void mapShouldThrowWhenMapIsCalledWithUnknownNonIntegerString() {
+		assertThatExceptionOfType(InvalidConfigurationPropertyValueException.class)
+			.isThrownBy(() -> JmsAcknowledgeModeMapper.map("some-string"));
+	}
+
+	private enum Mapping {
+
+		AUTO_LOWER_CASE("auto", Session.AUTO_ACKNOWLEDGE),
+
+		CLIENT_LOWER_CASE("client", Session.CLIENT_ACKNOWLEDGE),
+
+		DUPS_OK_LOWER_CASE("dups_ok", Session.DUPS_OK_ACKNOWLEDGE),
+
+		AUTO_UPPER_CASE("AUTO", Session.AUTO_ACKNOWLEDGE),
+
+		CLIENT_UPPER_CASE("CLIENT", Session.CLIENT_ACKNOWLEDGE),
+
+		DUPS_OK_UPPER_CASE("DUPS_OK", Session.DUPS_OK_ACKNOWLEDGE),
+
+		AUTO_MIXED_CASE("AuTo", Session.AUTO_ACKNOWLEDGE),
+
+		CLIENT_MIXED_CASE("CliEnT", Session.CLIENT_ACKNOWLEDGE),
+
+		DUPS_OK_MIXED_CASE("dUPs_Ok", Session.DUPS_OK_ACKNOWLEDGE),
+
+		DUPS_OK_KEBAB_CASE("DUPS-OK", Session.DUPS_OK_ACKNOWLEDGE),
+
+		DUPS_OK_NO_SEPARATOR_UPPER_CASE("DUPSOK", Session.DUPS_OK_ACKNOWLEDGE),
+
+		DUPS_OK_NO_SEPARATOR_LOWER_CASE("dupsok", Session.DUPS_OK_ACKNOWLEDGE),
+
+		DUPS_OK_NO_SEPARATOR_MIXED_CASE("duPSok", Session.DUPS_OK_ACKNOWLEDGE),
+
+		INTEGER("36", 36);
+
+		private final String actual;
+
+		private final int expected;
+
+		Mapping(String actual, int expected) {
+			this.actual = actual;
+			this.expected = expected;
+		}
+
+	}
+
+}

spring-boot-project/spring-boot-autoconfigure/src/test/java/org/springframework/boot/autoconfigure/jms/JmsAutoConfigurationTests.java

@@ -160,6 +160,16 @@ private void testJmsListenerContainerFactoryWithCustomSettings(AssertableApplica
 		assertThat(container).hasFieldOrPropertyWithValue("receiveTimeout", 2000L);
 	}
 
+	@Test
+	void testJmsListenerContainerFactoryWithNonStandardAcknowledgeMode() {
+		this.contextRunner.withUserConfiguration(EnableJmsConfiguration.class)
+			.withPropertyValues("spring.jms.listener.session.acknowledge-mode=9")
+			.run((context) -> {
+				DefaultMessageListenerContainer container = getContainer(context, "jmsListenerContainerFactory");
+				assertThat(container.getSessionAcknowledgeMode()).isEqualTo(9);
+			});
+	}
+
 	@Test
 	void testJmsListenerContainerFactoryWithDefaultSettings() {
 		this.contextRunner.withUserConfiguration(EnableJmsConfiguration.class)
@@ -300,6 +310,16 @@ void testJmsTemplateFullCustomization() {
 			});
 	}
 
+	@Test
+	void testJmsTemplateWithNonStandardAcknowledgeMode() {
+		this.contextRunner.withUserConfiguration(EnableJmsConfiguration.class)
+			.withPropertyValues("spring.jms.template.session.acknowledge-mode=7")
+			.run((context) -> {
+				JmsTemplate jmsTemplate = context.getBean(JmsTemplate.class);
+				assertThat(jmsTemplate.getSessionAcknowledgeMode()).isEqualTo(7);
+			});
+	}
+
 	@Test
 	void testJmsMessagingTemplateUseConfiguredDefaultDestination() {
 		this.contextRunner.withPropertyValues("spring.jms.template.default-destination=testQueue").run((context) -> {