Assert JmsActivationSpecConfig.setAcknowledgeMode() values

See gh-30851
spring-projects · Jul 31, 2023 · 9da318a · 9da318a
1 parent b45bfca
commit 9da318a
Show file tree

Hide file tree

Showing 2 changed files with 20 additions and 1 deletion.
diff --git a/...-jms/src/main/java/org/springframework/jms/listener/endpoint/JmsActivationSpecConfig.java b/...-jms/src/main/java/org/springframework/jms/listener/endpoint/JmsActivationSpecConfig.java
@@ -206,7 +206,7 @@ public void setAcknowledgeModeName(String constantName) {
 		Assert.hasText(constantName, "'constantName' must not be null or blank");
 		Integer acknowledgeMode = sessionConstants.get(constantName);
 		Assert.notNull(acknowledgeMode, "Only acknowledge mode constants allowed");
-		setAcknowledgeMode(acknowledgeMode);
+		this.acknowledgeMode = acknowledgeMode;
 	}
 
 	/**
@@ -217,6 +217,8 @@ public void setAcknowledgeModeName(String constantName) {
 	 * @see jakarta.jms.Session#SESSION_TRANSACTED
 	 */
 	public void setAcknowledgeMode(int acknowledgeMode) {
+		Assert.isTrue(sessionConstants.containsValue(acknowledgeMode),
+				"Only values of acknowledge mode constants allowed");
 		this.acknowledgeMode = acknowledgeMode;
 	}
 

diff --git a/...src/test/java/org/springframework/jms/listener/endpoint/JmsActivationSpecConfigTests.java b/...src/test/java/org/springframework/jms/listener/endpoint/JmsActivationSpecConfigTests.java
@@ -65,6 +65,23 @@ void setAcknowledgeModeNameToAllSupportedValues() {
 		assertThat(uniqueValues).hasSize(4);
 	}
 
+	@Test
+	void setSessionAcknowledgeMode() {
+		assertThatIllegalArgumentException().isThrownBy(() -> specConfig.setAcknowledgeMode(999));
+
+		specConfig.setAcknowledgeMode(Session.AUTO_ACKNOWLEDGE);
+		assertThat(specConfig.getAcknowledgeMode()).isEqualTo(Session.AUTO_ACKNOWLEDGE);
+
+		specConfig.setAcknowledgeMode(Session.CLIENT_ACKNOWLEDGE);
+		assertThat(specConfig.getAcknowledgeMode()).isEqualTo(Session.CLIENT_ACKNOWLEDGE);
+
+		specConfig.setAcknowledgeMode(Session.DUPS_OK_ACKNOWLEDGE);
+		assertThat(specConfig.getAcknowledgeMode()).isEqualTo(Session.DUPS_OK_ACKNOWLEDGE);
+
+		specConfig.setAcknowledgeMode(Session.SESSION_TRANSACTED);
+		assertThat(specConfig.getAcknowledgeMode()).isEqualTo(Session.SESSION_TRANSACTED);
+	}
+
 
 	private static Stream<String> streamAcknowledgeModeConstants() {
 		return Arrays.stream(Session.class.getFields())