From 0acff625da65ff3c7d1378d5fe8f12c77e173766 Mon Sep 17 00:00:00 2001
From: Mark Fisher <markfisher@vmware.com>
Date: Thu, 15 Sep 2011 07:21:44 -0400
Subject: [PATCH] polishing

---
 .../groovy/config/GroovyControlBusFactoryBean.java     | 10 ++++------
 1 file changed, 4 insertions(+), 6 deletions(-)

diff --git a/spring-integration-groovy/src/main/java/org/springframework/integration/groovy/config/GroovyControlBusFactoryBean.java b/spring-integration-groovy/src/main/java/org/springframework/integration/groovy/config/GroovyControlBusFactoryBean.java
index 7f41bb9805..715d1b7049 100644
--- a/spring-integration-groovy/src/main/java/org/springframework/integration/groovy/config/GroovyControlBusFactoryBean.java
+++ b/spring-integration-groovy/src/main/java/org/springframework/integration/groovy/config/GroovyControlBusFactoryBean.java
@@ -17,9 +17,7 @@ import java.util.HashMap;
 import java.util.Map;
 
 import org.springframework.beans.factory.BeanFactory;
-import org.springframework.beans.factory.config.BeanDefinition;
 import org.springframework.beans.factory.config.ConfigurableListableBeanFactory;
-import org.springframework.beans.factory.support.DefaultListableBeanFactory;
 import org.springframework.context.Lifecycle;
 import org.springframework.core.annotation.AnnotationUtils;
 import org.springframework.integration.Message;
@@ -78,7 +76,8 @@ public class GroovyControlBusFactoryBean extends AbstractSimpleMessageHandlerFac
 		private final ConfigurableListableBeanFactory beanFactory;
 
 		public ManagedBeansScriptVariableGenerator(BeanFactory beanFactory) {
-			this.beanFactory = (beanFactory instanceof ConfigurableListableBeanFactory) ? (ConfigurableListableBeanFactory) beanFactory : null;
+			this.beanFactory = (beanFactory instanceof ConfigurableListableBeanFactory)
+					? (ConfigurableListableBeanFactory) beanFactory : null;
 		}
 
 		public Map<String, Object> generateScriptVariables(Message<?> message) {
@@ -86,15 +85,14 @@ public class GroovyControlBusFactoryBean extends AbstractSimpleMessageHandlerFac
 			variables.put("headers", message.getHeaders());
 			if (this.beanFactory != null) {
 				for (String name : this.beanFactory.getBeanDefinitionNames()) {
-					BeanDefinition def = this.beanFactory.getBeanDefinition(name);
-					if (!def.isAbstract()){
+					if (!this.beanFactory.getBeanDefinition(name).isAbstract()) {
 						Object bean = this.beanFactory.getBean(name);
 						if (bean instanceof Lifecycle ||
 								bean instanceof CustomizableThreadCreator || 
 								(AnnotationUtils.findAnnotation(bean.getClass(), ManagedResource.class) != null)) {
 							variables.put(name, bean);
 						}
-					}					
+					}
 				}
 			}
 			return variables;