diff --git a/spring-integration-core/src/main/java/org/springframework/integration/config/IntegrationNamespaceHandler.java b/spring-integration-core/src/main/java/org/springframework/integration/config/IntegrationNamespaceHandler.java index 1f559efc5d..627562a418 100644 --- a/spring-integration-core/src/main/java/org/springframework/integration/config/IntegrationNamespaceHandler.java +++ b/spring-integration-core/src/main/java/org/springframework/integration/config/IntegrationNamespaceHandler.java @@ -24,6 +24,7 @@ import java.util.Properties; import org.apache.commons.logging.Log; import org.apache.commons.logging.LogFactory; + import org.springframework.beans.factory.xml.BeanDefinitionParser; import org.springframework.beans.factory.xml.NamespaceHandlerSupport; import org.springframework.core.io.support.PropertiesLoaderUtils; diff --git a/spring-integration-core/src/test/java/org/springframework/integration/config/MessageBusParserTests.java b/spring-integration-core/src/test/java/org/springframework/integration/config/MessageBusParserTests.java index a47160aad7..efb8ed1509 100644 --- a/spring-integration-core/src/test/java/org/springframework/integration/config/MessageBusParserTests.java +++ b/spring-integration-core/src/test/java/org/springframework/integration/config/MessageBusParserTests.java @@ -145,16 +145,13 @@ public class MessageBusParserTests { TestMessageBusAwareImpl messageBusAware = (TestMessageBusAwareImpl) context.getBean("messageBusAwareBean"); assertTrue(messageBusAware.getMessageBus() == context.getBean(MessageBusParser.MESSAGE_BUS_BEAN_NAME)); } - + @Test public void testMessageBusWithChannelFactory() { ApplicationContext context = new ClassPathXmlApplicationContext("messageBusWithChannelFactory.xml", this.getClass()); - MessageBus bus = (MessageBus) context.getBean(MessageBusParser.MESSAGE_BUS_BEAN_NAME); - assertTrue (context.getBean("defaultTypeChannel") instanceof SynchronousChannel); - assertTrue (context.getBean("specifiedTypeChannel") instanceof QueueChannel); - - + assertEquals(SynchronousChannel.class, context.getBean("defaultTypeChannel").getClass()); + assertEquals(QueueChannel.class, context.getBean("specifiedTypeChannel").getClass()); } }