Assert DefaultMessageListenerContainer.setCacheLevel() values

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

Hide file tree

Showing 2 changed files with 24 additions and 1 deletion.
diff --git a/...g-jms/src/main/java/org/springframework/jms/listener/DefaultMessageListenerContainer.java b/...g-jms/src/main/java/org/springframework/jms/listener/DefaultMessageListenerContainer.java
@@ -280,7 +280,7 @@ public void setCacheLevelName(String constantName) throws IllegalArgumentExcepti
 		Assert.hasText(constantName, "'constantName' must not be null or blank");
 		Integer cacheLevel = constants.get(constantName);
 		Assert.notNull(cacheLevel, "Only cache constants allowed");
-		setCacheLevel(cacheLevel);
+		this.cacheLevel = cacheLevel;
 	}
 
 	/**
@@ -304,6 +304,7 @@ public void setCacheLevelName(String constantName) throws IllegalArgumentExcepti
 	 * @see #setTransactionManager
 	 */
 	public void setCacheLevel(int cacheLevel) {
+		Assert.isTrue(constants.containsValue(cacheLevel), "Only values of cache constants allowed");
 		this.cacheLevel = cacheLevel;
 	}
 

diff --git a/.../src/test/java/org/springframework/jms/listener/DefaultMessageListenerContainerTests.java b/.../src/test/java/org/springframework/jms/listener/DefaultMessageListenerContainerTests.java
@@ -172,6 +172,28 @@ void setCacheLevelNameToAllSupportedValues() {
 		assertThat(uniqueValues).hasSize(5);
 	}
 
+	@Test
+	void setCacheLevel() {
+		DefaultMessageListenerContainer container = new DefaultMessageListenerContainer();
+
+		assertThatIllegalArgumentException().isThrownBy(() -> container.setCacheLevel(999));
+
+		container.setCacheLevel(DefaultMessageListenerContainer.CACHE_NONE);
+		assertThat(container.getCacheLevel()).isEqualTo(DefaultMessageListenerContainer.CACHE_NONE);
+
+		container.setCacheLevel(DefaultMessageListenerContainer.CACHE_CONNECTION);
+		assertThat(container.getCacheLevel()).isEqualTo(DefaultMessageListenerContainer.CACHE_CONNECTION);
+
+		container.setCacheLevel(DefaultMessageListenerContainer.CACHE_SESSION);
+		assertThat(container.getCacheLevel()).isEqualTo(DefaultMessageListenerContainer.CACHE_SESSION);
+
+		container.setCacheLevel(DefaultMessageListenerContainer.CACHE_CONSUMER);
+		assertThat(container.getCacheLevel()).isEqualTo(DefaultMessageListenerContainer.CACHE_CONSUMER);
+
+		container.setCacheLevel(DefaultMessageListenerContainer.CACHE_AUTO);
+		assertThat(container.getCacheLevel()).isEqualTo(DefaultMessageListenerContainer.CACHE_AUTO);
+	}
+
 
 	private static Stream<String> streamCacheConstants() {
 		return Arrays.stream(DefaultMessageListenerContainer.class.getFields())