From f527025256b574a24f3f98f205944562d50deaba Mon Sep 17 00:00:00 2001
From: abilan <abilan@vmware.com>
Date: Mon, 17 Jul 2023 11:07:24 -0400
Subject: [PATCH] Fix placeholder in `JmsChannelParser` for `cache`

Looks like spring JMS does not uppercase the `cacheLevelName` before assigning
anymore.

* Remove `toUpperCase()` for `cache` in the `JmsChannelParser` logic.
* Perform `toUpperCase()` in the `JmsChannelFactoryBean.setCacheLevelName()` instead
---
 .../integration/jms/config/JmsChannelFactoryBean.java  |  5 +++--
 .../integration/jms/config/JmsChannelParser.java       | 10 ++++++----
 2 files changed, 9 insertions(+), 6 deletions(-)

diff --git a/spring-integration-jms/src/main/java/org/springframework/integration/jms/config/JmsChannelFactoryBean.java b/spring-integration-jms/src/main/java/org/springframework/integration/jms/config/JmsChannelFactoryBean.java
index 531155d0de..e904cdfe81 100644
--- a/spring-integration-jms/src/main/java/org/springframework/integration/jms/config/JmsChannelFactoryBean.java
+++ b/spring-integration-jms/src/main/java/org/springframework/integration/jms/config/JmsChannelFactoryBean.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2002-2021 the original author or authors.
+ * Copyright 2002-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.
@@ -203,9 +203,10 @@ public class JmsChannelFactoryBean extends AbstractFactoryBean<AbstractJmsChanne
 	}
 
 	public void setCacheLevelName(String cacheLevelName) {
+		Assert.hasText(cacheLevelName, "The 'cacheLevelName' must not be empty");
 		Assert.isTrue(this.messageDriven, "'cacheLevelName' is allowed only in case of 'messageDriven = true'");
 		Assert.state(this.cacheLevel == null, "'cacheLevelName' and 'cacheLevel' are mutually exclusive");
-		this.cacheLevelName = cacheLevelName;
+		this.cacheLevelName = cacheLevelName.toUpperCase();
 	}
 
 	public void setCacheLevel(Integer cacheLevel) {
diff --git a/spring-integration-jms/src/main/java/org/springframework/integration/jms/config/JmsChannelParser.java b/spring-integration-jms/src/main/java/org/springframework/integration/jms/config/JmsChannelParser.java
index 6993823c6c..b9475eafed 100644
--- a/spring-integration-jms/src/main/java/org/springframework/integration/jms/config/JmsChannelParser.java
+++ b/spring-integration-jms/src/main/java/org/springframework/integration/jms/config/JmsChannelParser.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2002-2022 the original author or authors.
+ * Copyright 2002-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.
@@ -23,6 +23,8 @@ import org.springframework.beans.factory.support.BeanDefinitionBuilder;
 import org.springframework.beans.factory.xml.ParserContext;
 import org.springframework.integration.config.xml.AbstractChannelParser;
 import org.springframework.integration.config.xml.IntegrationNamespaceUtils;
+import org.springframework.jms.listener.DefaultMessageListenerContainer;
+import org.springframework.jms.listener.SimpleMessageListenerContainer;
 import org.springframework.util.StringUtils;
 
 /**
@@ -119,10 +121,10 @@ public class JmsChannelParser extends AbstractChannelParser {
 		String containerClass = element.getAttribute(CONTAINER_CLASS_ATTRIBUTE);
 		if (!StringUtils.hasText(containerClass) && StringUtils.hasText(containerType)) {
 			if ("default".equals(containerType)) {
-				containerClass = "org.springframework.jms.listener.DefaultMessageListenerContainer";
+				containerClass = DefaultMessageListenerContainer.class.getName();
 			}
 			else if ("simple".equals(containerType)) {
-				containerClass = "org.springframework.jms.listener.SimpleMessageListenerContainer";
+				containerClass = SimpleMessageListenerContainer.class.getName();
 			}
 		}
 		/*
@@ -151,7 +153,7 @@ public class JmsChannelParser extends AbstractChannelParser {
 				}
 			}
 			else {
-				builder.addPropertyValue("cacheLevelName", "CACHE_" + cache.toUpperCase());
+				builder.addPropertyValue("cacheLevelName", "CACHE_" + cache);
 			}
 		}
 	}