From 62dfc9984424c3838d4f3356f4e5d45fc0e3f86d Mon Sep 17 00:00:00 2001
From: Gary Russell <grussell@gopivotal.com>
Date: Mon, 7 Jul 2014 20:37:08 -0400
Subject: [PATCH] Undo "INT-3435: Make `JmsChannelFB` more friendly"

This reverts commit 04131c2d0b933c1a90b9f27285381662b1b31fc9.
---
 .../jms/config/JmsChannelFactoryBean.java     | 48 ++-----------------
 1 file changed, 5 insertions(+), 43 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 980833f0a2..fbfd6c03fc 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
@@ -49,11 +49,9 @@ import org.springframework.util.StringUtils;
  * @author Mark Fisher
  * @author Oleg Zhurakousky
  * @author Gary Russell
- * @author Artem Bilan
  * @since 2.0
  */
-public class JmsChannelFactoryBean extends AbstractFactoryBean<AbstractJmsChannel>
-		implements SmartLifecycle, DisposableBean, BeanNameAware {
+public class JmsChannelFactoryBean extends AbstractFactoryBean<AbstractJmsChannel> implements SmartLifecycle, DisposableBean, BeanNameAware {
 
 	private volatile AbstractJmsChannel channel;
 
@@ -73,8 +71,6 @@ public class JmsChannelFactoryBean extends AbstractFactoryBean<AbstractJmsChanne
 
 	private volatile String cacheLevelName;
 
-	private volatile Integer cacheLevel;
-
 	private volatile String clientId;
 
 	private volatile String concurrency;
@@ -190,8 +186,6 @@ public class JmsChannelFactoryBean extends AbstractFactoryBean<AbstractJmsChanne
 	 */
 
 	public void setAcceptMessagesWhileStopping(boolean acceptMessagesWhileStopping) {
-		Assert.isTrue(this.messageDriven,
-				"'acceptMessagesWhileStopping' is allowed only in case of 'messageDriven = true'");
 		this.acceptMessagesWhileStopping = acceptMessagesWhileStopping;
 	}
 
@@ -200,31 +194,18 @@ public class JmsChannelFactoryBean extends AbstractFactoryBean<AbstractJmsChanne
 	}
 
 	public void setCacheLevelName(String cacheLevelName) {
-		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;
 	}
 
-	public void setCacheLevel(Integer cacheLevel) {
-		Assert.isTrue(this.messageDriven, "'cacheLevel' is allowed only in case of 'messageDriven = true'");
-		Assert.state(!StringUtils.hasText(this.cacheLevelName),
-				"'cacheLevelName' and 'cacheLevel' are mutually exclusive");
-		this.cacheLevel = cacheLevel;
-	}
-
 	public void setClientId(String clientId) {
-		Assert.isTrue(this.messageDriven, "'clientId' is allowed only in case of 'messageDriven = true'");
 		this.clientId = clientId;
 	}
 
 	public void setConcurrency(String concurrency) {
-		Assert.isTrue(this.messageDriven, "'concurrency' is allowed only in case of 'messageDriven = true'");
 		this.concurrency = concurrency;
 	}
 
 	public void setConcurrentConsumers(int concurrentConsumers) {
-		Assert.isTrue(this.messageDriven, "'concurrentConsumers' is allowed only in case of 'messageDriven = true'");
 		this.concurrentConsumers = concurrentConsumers;
 	}
 
@@ -234,7 +215,6 @@ public class JmsChannelFactoryBean extends AbstractFactoryBean<AbstractJmsChanne
 	}
 
 	public void setContainerType(Class<? extends AbstractMessageListenerContainer> containerType) {
-		Assert.isTrue(this.messageDriven, "'containerType' is allowed only in case of 'messageDriven = true'");
 		this.containerType = containerType;
 	}
 
@@ -252,42 +232,34 @@ public class JmsChannelFactoryBean extends AbstractFactoryBean<AbstractJmsChanne
 	}
 
 	public void setDurableSubscriptionName(String durableSubscriptionName) {
-		Assert.isTrue(this.messageDriven, "'durableSubscriptionName' is allowed only in case of 'messageDriven = true'");
 		this.durableSubscriptionName = durableSubscriptionName;
 	}
 
 	public void setErrorHandler(ErrorHandler errorHandler) {
-		Assert.isTrue(this.messageDriven, "'errorHandler' is allowed only in case of 'messageDriven = true'");
 		this.errorHandler = errorHandler;
 	}
 
 	public void setExceptionListener(ExceptionListener exceptionListener) {
-		Assert.isTrue(this.messageDriven, "'exceptionListener' is allowed only in case of 'messageDriven = true'");
 		this.exceptionListener = exceptionListener;
 	}
 
 	public void setExposeListenerSession(boolean exposeListenerSession) {
-		Assert.isTrue(this.messageDriven, "'exposeListenerSession' is allowed only in case of 'messageDriven = true'");
 		this.exposeListenerSession = exposeListenerSession;
 	}
 
 	public void setIdleTaskExecutionLimit(int idleTaskExecutionLimit) {
-		Assert.isTrue(this.messageDriven, "'idleTaskExecutionLimit' is allowed only in case of 'messageDriven = true'");
 		this.idleTaskExecutionLimit = idleTaskExecutionLimit;
 	}
 
 	public void setMaxConcurrentConsumers(int maxConcurrentConsumers) {
-		Assert.isTrue(this.messageDriven, "'maxConcurrentConsumers' is allowed only in case of 'messageDriven = true'");
 		this.maxConcurrentConsumers = maxConcurrentConsumers;
 	}
 
 	public void setMaxMessagesPerTask(int maxMessagesPerTask) {
-		Assert.isTrue(this.messageDriven, "'maxMessagesPerTask' is allowed only in case of 'messageDriven = true'");
 		this.maxMessagesPerTask = maxMessagesPerTask;
 	}
 
 	public void setMessageSelector(String messageSelector) {
-		Assert.isTrue(this.messageDriven, "'messageSelector' is allowed only in case of 'messageDriven = true'");
 		this.messageSelector = messageSelector;
 	}
 
@@ -311,7 +283,6 @@ public class JmsChannelFactoryBean extends AbstractFactoryBean<AbstractJmsChanne
 	}
 
 	public void setRecoveryInterval(long recoveryInterval) {
-		Assert.isTrue(this.messageDriven, "'recoveryInterval' is allowed only in case of 'messageDriven = true'");
 		this.recoveryInterval = recoveryInterval;
 	}
 
@@ -326,32 +297,26 @@ public class JmsChannelFactoryBean extends AbstractFactoryBean<AbstractJmsChanne
 	}
 
 	public void setSubscriptionDurable(boolean subscriptionDurable) {
-		Assert.isTrue(this.messageDriven, "'subscriptionDurable' is allowed only in case of 'messageDriven = true'");
 		this.subscriptionDurable = subscriptionDurable;
 	}
 
 	public void setTaskExecutor(Executor taskExecutor) {
-		Assert.isTrue(this.messageDriven, "'taskExecutor' is allowed only in case of 'messageDriven = true'");
 		this.taskExecutor = taskExecutor;
 	}
 
 	public void setTransactionManager(PlatformTransactionManager transactionManager) {
-		Assert.isTrue(this.messageDriven, "'transactionManager' is allowed only in case of 'messageDriven = true'");
 		this.transactionManager = transactionManager;
 	}
 
 	public void setTransactionName(String transactionName) {
-		Assert.isTrue(this.messageDriven, "'transactionName' is allowed only in case of 'messageDriven = true'");
 		this.transactionName = transactionName;
 	}
 
 	public void setTransactionTimeout(int transactionTimeout) {
-		Assert.isTrue(this.messageDriven, "'transactionTimeout' is allowed only in case of 'messageDriven = true'");
 		this.transactionTimeout = transactionTimeout;
 	}
 
 	public void setMaxSubscribers(int maxSubscribers) {
-		Assert.isTrue(this.messageDriven, "'maxSubscribers' is allowed only in case of 'messageDriven = true'");
 		this.maxSubscribers = maxSubscribers;
 	}
 
@@ -448,10 +413,6 @@ public class JmsChannelFactoryBean extends AbstractFactoryBean<AbstractJmsChanne
 				dmlc.setCacheLevelName(this.cacheLevelName);
 			}
 
-			if (this.cacheLevel != null) {
-				dmlc.setCacheLevel(this.cacheLevel);
-			}
-
 			if (StringUtils.hasText(this.concurrency)){
 				dmlc.setConcurrency(this.concurrency);
 			}
@@ -509,7 +470,8 @@ public class JmsChannelFactoryBean extends AbstractFactoryBean<AbstractJmsChanne
 
 	@Override
 	public boolean isAutoStartup() {
-		return this.channel instanceof SubscribableJmsChannel && ((SubscribableJmsChannel) this.channel).isAutoStartup();
+		return (this.channel instanceof SubscribableJmsChannel) ?
+				((SubscribableJmsChannel) this.channel).isAutoStartup() : false;
 	}
 
 	@Override
@@ -520,7 +482,8 @@ public class JmsChannelFactoryBean extends AbstractFactoryBean<AbstractJmsChanne
 
 	@Override
 	public boolean isRunning() {
-		return this.channel instanceof SubscribableJmsChannel && ((SubscribableJmsChannel) this.channel).isRunning();
+		return (this.channel instanceof SubscribableJmsChannel) ?
+				((SubscribableJmsChannel) this.channel).isRunning() : false;
 	}
 
 	@Override
@@ -550,5 +513,4 @@ public class JmsChannelFactoryBean extends AbstractFactoryBean<AbstractJmsChanne
 			((SubscribableJmsChannel) this.channel).destroy();
 		}
 	}
-
 }