diff --git a/org.springframework.integration.adapter/src/main/java/org/springframework/integration/adapter/AbstractRemotingOutboundGateway.java b/org.springframework.integration.adapter/src/main/java/org/springframework/integration/adapter/AbstractRemotingOutboundGateway.java index d9824163b4..cc8fb06732 100644 --- a/org.springframework.integration.adapter/src/main/java/org/springframework/integration/adapter/AbstractRemotingOutboundGateway.java +++ b/org.springframework.integration.adapter/src/main/java/org/springframework/integration/adapter/AbstractRemotingOutboundGateway.java @@ -18,8 +18,8 @@ package org.springframework.integration.adapter; import java.io.Serializable; -import org.springframework.integration.channel.MessageChannel; import org.springframework.integration.core.Message; +import org.springframework.integration.core.MessageChannel; import org.springframework.integration.endpoint.AbstractReplyProducingMessageConsumer; import org.springframework.integration.endpoint.ReplyMessageHolder; import org.springframework.integration.message.MessageHandlingException; diff --git a/org.springframework.integration.file/src/test/java/org/springframework/integration/file/config/FileInboundChannelAdapterParserTests.java b/org.springframework.integration.file/src/test/java/org/springframework/integration/file/config/FileInboundChannelAdapterParserTests.java index d43918093e..f6bfc99bb2 100644 --- a/org.springframework.integration.file/src/test/java/org/springframework/integration/file/config/FileInboundChannelAdapterParserTests.java +++ b/org.springframework.integration.file/src/test/java/org/springframework/integration/file/config/FileInboundChannelAdapterParserTests.java @@ -26,7 +26,7 @@ import org.junit.Test; import org.junit.runner.RunWith; import org.springframework.beans.DirectFieldAccessor; import org.springframework.beans.factory.annotation.Autowired; -import org.springframework.integration.channel.MessageChannel; +import org.springframework.integration.core.MessageChannel; import org.springframework.integration.file.CompositeFileListFilter; import org.springframework.integration.file.PollableFileSource; import org.springframework.test.context.ContextConfiguration; diff --git a/org.springframework.integration.httpinvoker/src/test/java/org/springframework/integration/httpinvoker/HttpInvokerInboundGatewayTests.java b/org.springframework.integration.httpinvoker/src/test/java/org/springframework/integration/httpinvoker/HttpInvokerInboundGatewayTests.java index ff1cc0920c..984fb057b1 100644 --- a/org.springframework.integration.httpinvoker/src/test/java/org/springframework/integration/httpinvoker/HttpInvokerInboundGatewayTests.java +++ b/org.springframework.integration.httpinvoker/src/test/java/org/springframework/integration/httpinvoker/HttpInvokerInboundGatewayTests.java @@ -29,9 +29,9 @@ import java.util.concurrent.Executors; import org.junit.Test; -import org.springframework.integration.channel.MessageChannel; import org.springframework.integration.channel.QueueChannel; import org.springframework.integration.core.Message; +import org.springframework.integration.core.MessageChannel; import org.springframework.integration.httpinvoker.HttpInvokerInboundGateway; import org.springframework.integration.message.StringMessage; import org.springframework.mock.web.MockHttpServletRequest; diff --git a/org.springframework.integration.httpinvoker/src/test/java/org/springframework/integration/httpinvoker/config/HttpInvokerInboundGatewayParserTests.java b/org.springframework.integration.httpinvoker/src/test/java/org/springframework/integration/httpinvoker/config/HttpInvokerInboundGatewayParserTests.java index 4b833cca6f..5af9a19821 100644 --- a/org.springframework.integration.httpinvoker/src/test/java/org/springframework/integration/httpinvoker/config/HttpInvokerInboundGatewayParserTests.java +++ b/org.springframework.integration.httpinvoker/src/test/java/org/springframework/integration/httpinvoker/config/HttpInvokerInboundGatewayParserTests.java @@ -23,8 +23,8 @@ import org.junit.Test; import org.springframework.beans.DirectFieldAccessor; import org.springframework.context.ApplicationContext; import org.springframework.context.support.ClassPathXmlApplicationContext; -import org.springframework.integration.channel.MessageChannel; import org.springframework.integration.channel.MessageChannelTemplate; +import org.springframework.integration.core.MessageChannel; import org.springframework.integration.httpinvoker.HttpInvokerInboundGateway; /** diff --git a/org.springframework.integration.jms/src/main/java/org/springframework/integration/jms/ChannelPublishingJmsListener.java b/org.springframework.integration.jms/src/main/java/org/springframework/integration/jms/ChannelPublishingJmsListener.java index 9140fb679a..dace0d59ad 100644 --- a/org.springframework.integration.jms/src/main/java/org/springframework/integration/jms/ChannelPublishingJmsListener.java +++ b/org.springframework.integration.jms/src/main/java/org/springframework/integration/jms/ChannelPublishingJmsListener.java @@ -18,9 +18,9 @@ package org.springframework.integration.jms; import javax.jms.MessageListener; -import org.springframework.integration.channel.MessageChannel; import org.springframework.integration.channel.MessageChannelTemplate; import org.springframework.integration.core.Message; +import org.springframework.integration.core.MessageChannel; import org.springframework.integration.message.MessageDeliveryException; import org.springframework.integration.message.MessagingException; import org.springframework.jms.support.converter.MessageConverter; diff --git a/org.springframework.integration.rmi/src/main/java/org/springframework/integration/rmi/RmiInboundGateway.java b/org.springframework.integration.rmi/src/main/java/org/springframework/integration/rmi/RmiInboundGateway.java index 415b4bdb77..2f37579af2 100644 --- a/org.springframework.integration.rmi/src/main/java/org/springframework/integration/rmi/RmiInboundGateway.java +++ b/org.springframework.integration.rmi/src/main/java/org/springframework/integration/rmi/RmiInboundGateway.java @@ -22,7 +22,7 @@ import java.rmi.registry.Registry; import org.springframework.beans.factory.InitializingBean; import org.springframework.integration.adapter.MessageHandler; import org.springframework.integration.adapter.RemotingInboundGatewaySupport; -import org.springframework.integration.channel.MessageChannel; +import org.springframework.integration.core.MessageChannel; import org.springframework.remoting.rmi.RmiServiceExporter; import org.springframework.remoting.support.RemoteInvocationExecutor; import org.springframework.util.Assert; diff --git a/org.springframework.integration.rmi/src/test/java/org/springframework/integration/rmi/config/RmiInboundGatewayParserTests.java b/org.springframework.integration.rmi/src/test/java/org/springframework/integration/rmi/config/RmiInboundGatewayParserTests.java index 5dfa12b97a..6c401c8ae6 100644 --- a/org.springframework.integration.rmi/src/test/java/org/springframework/integration/rmi/config/RmiInboundGatewayParserTests.java +++ b/org.springframework.integration.rmi/src/test/java/org/springframework/integration/rmi/config/RmiInboundGatewayParserTests.java @@ -24,8 +24,8 @@ import org.junit.Test; import org.springframework.beans.DirectFieldAccessor; import org.springframework.context.ApplicationContext; import org.springframework.context.support.ClassPathXmlApplicationContext; -import org.springframework.integration.channel.MessageChannel; import org.springframework.integration.channel.MessageChannelTemplate; +import org.springframework.integration.core.MessageChannel; import org.springframework.integration.rmi.RmiInboundGateway; /** diff --git a/org.springframework.integration.rmi/src/test/java/org/springframework/integration/rmi/config/RmiOutboundGatewayParserTests.java b/org.springframework.integration.rmi/src/test/java/org/springframework/integration/rmi/config/RmiOutboundGatewayParserTests.java index ebb8a89d66..02524a23c6 100644 --- a/org.springframework.integration.rmi/src/test/java/org/springframework/integration/rmi/config/RmiOutboundGatewayParserTests.java +++ b/org.springframework.integration.rmi/src/test/java/org/springframework/integration/rmi/config/RmiOutboundGatewayParserTests.java @@ -24,9 +24,9 @@ import org.junit.Test; import org.springframework.context.ApplicationContext; import org.springframework.context.support.ClassPathXmlApplicationContext; -import org.springframework.integration.channel.MessageChannel; import org.springframework.integration.channel.QueueChannel; import org.springframework.integration.core.Message; +import org.springframework.integration.core.MessageChannel; import org.springframework.integration.message.StringMessage; import org.springframework.integration.rmi.RmiInboundGateway; diff --git a/org.springframework.integration.samples/src/main/java/org/springframework/integration/samples/helloworld/HelloWorldDemo.java b/org.springframework.integration.samples/src/main/java/org/springframework/integration/samples/helloworld/HelloWorldDemo.java index 6a2c651e31..163939a2af 100644 --- a/org.springframework.integration.samples/src/main/java/org/springframework/integration/samples/helloworld/HelloWorldDemo.java +++ b/org.springframework.integration.samples/src/main/java/org/springframework/integration/samples/helloworld/HelloWorldDemo.java @@ -20,8 +20,8 @@ import org.springframework.context.support.AbstractApplicationContext; import org.springframework.context.support.ClassPathXmlApplicationContext; import org.springframework.integration.channel.BeanFactoryChannelResolver; import org.springframework.integration.channel.ChannelResolver; -import org.springframework.integration.channel.MessageChannel; import org.springframework.integration.channel.PollableChannel; +import org.springframework.integration.core.MessageChannel; import org.springframework.integration.message.StringMessage; /** diff --git a/org.springframework.integration.samples/src/main/java/org/springframework/integration/samples/ws/WebServiceDemo.java b/org.springframework.integration.samples/src/main/java/org/springframework/integration/samples/ws/WebServiceDemo.java index b83025be6d..5cb4dffa91 100644 --- a/org.springframework.integration.samples/src/main/java/org/springframework/integration/samples/ws/WebServiceDemo.java +++ b/org.springframework.integration.samples/src/main/java/org/springframework/integration/samples/ws/WebServiceDemo.java @@ -17,8 +17,8 @@ package org.springframework.integration.samples.ws; import org.springframework.context.support.ClassPathXmlApplicationContext; -import org.springframework.integration.channel.MessageChannel; import org.springframework.integration.core.Message; +import org.springframework.integration.core.MessageChannel; import org.springframework.integration.message.MessageBuilder; import org.springframework.integration.ws.AbstractWebServiceOutboundGateway; diff --git a/org.springframework.integration.security/src/main/java/org/springframework/integration/security/channel/ChannelInvocation.java b/org.springframework.integration.security/src/main/java/org/springframework/integration/security/channel/ChannelInvocation.java index 34355329bb..cc99899981 100644 --- a/org.springframework.integration.security/src/main/java/org/springframework/integration/security/channel/ChannelInvocation.java +++ b/org.springframework.integration.security/src/main/java/org/springframework/integration/security/channel/ChannelInvocation.java @@ -18,8 +18,8 @@ package org.springframework.integration.security.channel; import org.aopalliance.intercept.MethodInvocation; -import org.springframework.integration.channel.MessageChannel; import org.springframework.integration.core.Message; +import org.springframework.integration.core.MessageChannel; import org.springframework.util.Assert; /** diff --git a/org.springframework.integration.security/src/main/java/org/springframework/integration/security/channel/ChannelInvocationDefinitionSource.java b/org.springframework.integration.security/src/main/java/org/springframework/integration/security/channel/ChannelInvocationDefinitionSource.java index 603774e524..487ce108b7 100644 --- a/org.springframework.integration.security/src/main/java/org/springframework/integration/security/channel/ChannelInvocationDefinitionSource.java +++ b/org.springframework.integration.security/src/main/java/org/springframework/integration/security/channel/ChannelInvocationDefinitionSource.java @@ -25,7 +25,7 @@ import java.util.Map; import java.util.Set; import java.util.regex.Pattern; -import org.springframework.integration.channel.MessageChannel; +import org.springframework.integration.core.MessageChannel; import org.springframework.security.ConfigAttribute; import org.springframework.security.ConfigAttributeDefinition; import org.springframework.security.intercept.ObjectDefinitionSource; diff --git a/org.springframework.integration.security/src/main/java/org/springframework/integration/security/config/ChannelSecurityInterceptorBeanPostProcessor.java b/org.springframework.integration.security/src/main/java/org/springframework/integration/security/config/ChannelSecurityInterceptorBeanPostProcessor.java index a7f636817a..795194a62e 100644 --- a/org.springframework.integration.security/src/main/java/org/springframework/integration/security/config/ChannelSecurityInterceptorBeanPostProcessor.java +++ b/org.springframework.integration.security/src/main/java/org/springframework/integration/security/config/ChannelSecurityInterceptorBeanPostProcessor.java @@ -23,7 +23,7 @@ import org.springframework.aop.framework.ProxyFactory; import org.springframework.aop.support.DefaultPointcutAdvisor; import org.springframework.beans.BeansException; import org.springframework.beans.factory.config.BeanPostProcessor; -import org.springframework.integration.channel.MessageChannel; +import org.springframework.integration.core.MessageChannel; import org.springframework.integration.security.channel.ChannelInvocationDefinitionSource; import org.springframework.integration.security.channel.ChannelSecurityInterceptor; import org.springframework.util.Assert; diff --git a/org.springframework.integration.security/src/main/java/org/springframework/integration/security/config/SecuredChannelsParser.java b/org.springframework.integration.security/src/main/java/org/springframework/integration/security/config/SecuredChannelsParser.java index 594c43fc14..8e8a55b51f 100644 --- a/org.springframework.integration.security/src/main/java/org/springframework/integration/security/config/SecuredChannelsParser.java +++ b/org.springframework.integration.security/src/main/java/org/springframework/integration/security/config/SecuredChannelsParser.java @@ -25,8 +25,8 @@ import org.springframework.beans.factory.support.BeanDefinitionBuilder; import org.springframework.beans.factory.support.BeanDefinitionReaderUtils; import org.springframework.beans.factory.xml.AbstractSingleBeanDefinitionParser; import org.springframework.beans.factory.xml.ParserContext; -import org.springframework.integration.channel.MessageChannel; import org.springframework.integration.config.xml.IntegrationNamespaceUtils; +import org.springframework.integration.core.MessageChannel; import org.springframework.integration.security.channel.ChannelAccessPolicy; import org.springframework.integration.security.channel.ChannelInvocationDefinitionSource; import org.springframework.integration.security.channel.ChannelSecurityInterceptor; diff --git a/org.springframework.integration.security/src/test/java/org/springframework/integration/security/channel/ChannelAdapterSecurityIntegrationTests.java b/org.springframework.integration.security/src/test/java/org/springframework/integration/security/channel/ChannelAdapterSecurityIntegrationTests.java index d6fd135485..668dcadf68 100644 --- a/org.springframework.integration.security/src/test/java/org/springframework/integration/security/channel/ChannelAdapterSecurityIntegrationTests.java +++ b/org.springframework.integration.security/src/test/java/org/springframework/integration/security/channel/ChannelAdapterSecurityIntegrationTests.java @@ -23,7 +23,7 @@ import org.junit.Test; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.beans.factory.annotation.Qualifier; -import org.springframework.integration.channel.MessageChannel; +import org.springframework.integration.core.MessageChannel; import org.springframework.integration.message.StringMessage; import org.springframework.integration.security.SecurityTestUtils; import org.springframework.security.AccessDeniedException; diff --git a/org.springframework.integration.security/src/test/java/org/springframework/integration/security/channel/ChannelSecurityInterceptorBeanPostProcessorTests.java b/org.springframework.integration.security/src/test/java/org/springframework/integration/security/channel/ChannelSecurityInterceptorBeanPostProcessorTests.java index b6f867b30c..1e409c0815 100644 --- a/org.springframework.integration.security/src/test/java/org/springframework/integration/security/channel/ChannelSecurityInterceptorBeanPostProcessorTests.java +++ b/org.springframework.integration.security/src/test/java/org/springframework/integration/security/channel/ChannelSecurityInterceptorBeanPostProcessorTests.java @@ -24,8 +24,8 @@ import java.util.regex.Pattern; import org.junit.Test; import org.springframework.aop.support.AopUtils; -import org.springframework.integration.channel.MessageChannel; import org.springframework.integration.channel.QueueChannel; +import org.springframework.integration.core.MessageChannel; import org.springframework.integration.security.config.ChannelSecurityInterceptorBeanPostProcessor; /** diff --git a/org.springframework.integration.security/src/test/java/org/springframework/integration/security/channel/ChannelSecurityInterceptorTests.java b/org.springframework.integration.security/src/test/java/org/springframework/integration/security/channel/ChannelSecurityInterceptorTests.java index f96355abd8..523ad37ff6 100644 --- a/org.springframework.integration.security/src/test/java/org/springframework/integration/security/channel/ChannelSecurityInterceptorTests.java +++ b/org.springframework.integration.security/src/test/java/org/springframework/integration/security/channel/ChannelSecurityInterceptorTests.java @@ -23,8 +23,8 @@ import org.junit.After; import org.junit.Test; import org.springframework.aop.framework.ProxyFactory; -import org.springframework.integration.channel.MessageChannel; import org.springframework.integration.channel.QueueChannel; +import org.springframework.integration.core.MessageChannel; import org.springframework.integration.message.StringMessage; import org.springframework.integration.security.SecurityTestUtils; import org.springframework.security.AccessDeniedException; diff --git a/org.springframework.integration.security/src/test/java/org/springframework/integration/security/config/SecuredChannelsParserTests.java b/org.springframework.integration.security/src/test/java/org/springframework/integration/security/config/SecuredChannelsParserTests.java index 96ae64adb7..f2872de8ed 100644 --- a/org.springframework.integration.security/src/test/java/org/springframework/integration/security/config/SecuredChannelsParserTests.java +++ b/org.springframework.integration.security/src/test/java/org/springframework/integration/security/config/SecuredChannelsParserTests.java @@ -38,8 +38,8 @@ import org.springframework.aop.support.AopUtils; import org.springframework.beans.DirectFieldAccessor; import org.springframework.integration.channel.AbstractPollableChannel; import org.springframework.integration.channel.ChannelInterceptor; -import org.springframework.integration.channel.MessageChannel; import org.springframework.integration.core.Message; +import org.springframework.integration.core.MessageChannel; import org.springframework.integration.security.channel.ChannelAccessPolicy; import org.springframework.integration.security.channel.ChannelInvocationDefinitionSource; import org.springframework.integration.security.channel.ChannelSecurityInterceptor; diff --git a/org.springframework.integration.ws/src/main/java/org/springframework/integration/ws/AbstractWebServiceOutboundGateway.java b/org.springframework.integration.ws/src/main/java/org/springframework/integration/ws/AbstractWebServiceOutboundGateway.java index 9ddc9bc369..14fb5a77ab 100644 --- a/org.springframework.integration.ws/src/main/java/org/springframework/integration/ws/AbstractWebServiceOutboundGateway.java +++ b/org.springframework.integration.ws/src/main/java/org/springframework/integration/ws/AbstractWebServiceOutboundGateway.java @@ -19,8 +19,8 @@ package org.springframework.integration.ws; import java.io.IOException; import java.net.URI; -import org.springframework.integration.channel.MessageChannel; import org.springframework.integration.core.Message; +import org.springframework.integration.core.MessageChannel; import org.springframework.integration.endpoint.AbstractReplyProducingMessageConsumer; import org.springframework.integration.endpoint.ReplyMessageHolder; import org.springframework.util.Assert; diff --git a/org.springframework.integration.xml/src/test/java/org/springframework/integration/xml/config/XPathMessageSplitterParserTests.java b/org.springframework.integration.xml/src/test/java/org/springframework/integration/xml/config/XPathMessageSplitterParserTests.java index 13a5e32c98..24b5d7692b 100644 --- a/org.springframework.integration.xml/src/test/java/org/springframework/integration/xml/config/XPathMessageSplitterParserTests.java +++ b/org.springframework.integration.xml/src/test/java/org/springframework/integration/xml/config/XPathMessageSplitterParserTests.java @@ -22,8 +22,8 @@ import org.junit.Test; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.beans.factory.annotation.Qualifier; import org.springframework.beans.factory.config.AutowireCapableBeanFactory; -import org.springframework.integration.channel.MessageChannel; import org.springframework.integration.channel.QueueChannel; +import org.springframework.integration.core.MessageChannel; import org.springframework.integration.endpoint.SubscribingConsumerEndpoint; import org.springframework.integration.message.GenericMessage; import org.springframework.integration.xml.util.XmlTestUtil; diff --git a/org.springframework.integration.xml/src/test/java/org/springframework/integration/xml/config/XPathRouterParserTests.java b/org.springframework.integration.xml/src/test/java/org/springframework/integration/xml/config/XPathRouterParserTests.java index c8bffb1b66..e6f8504a94 100644 --- a/org.springframework.integration.xml/src/test/java/org/springframework/integration/xml/config/XPathRouterParserTests.java +++ b/org.springframework.integration.xml/src/test/java/org/springframework/integration/xml/config/XPathRouterParserTests.java @@ -24,8 +24,8 @@ import org.springframework.beans.factory.annotation.Autowired; import org.springframework.beans.factory.annotation.Qualifier; import org.springframework.beans.factory.config.AutowireCapableBeanFactory; import org.springframework.context.ConfigurableApplicationContext; -import org.springframework.integration.channel.MessageChannel; import org.springframework.integration.channel.QueueChannel; +import org.springframework.integration.core.MessageChannel; import org.springframework.integration.endpoint.SubscribingConsumerEndpoint; import org.springframework.integration.message.GenericMessage; import org.springframework.integration.xml.util.XmlTestUtil; diff --git a/org.springframework.integration.xml/src/test/java/org/springframework/integration/xml/config/XmlMarshallingTransformerParserTests.java b/org.springframework.integration.xml/src/test/java/org/springframework/integration/xml/config/XmlMarshallingTransformerParserTests.java index ea7a578766..78b4a23737 100644 --- a/org.springframework.integration.xml/src/test/java/org/springframework/integration/xml/config/XmlMarshallingTransformerParserTests.java +++ b/org.springframework.integration.xml/src/test/java/org/springframework/integration/xml/config/XmlMarshallingTransformerParserTests.java @@ -27,9 +27,9 @@ import org.w3c.dom.Document; import org.springframework.context.ApplicationContext; import org.springframework.context.support.ClassPathXmlApplicationContext; -import org.springframework.integration.channel.MessageChannel; import org.springframework.integration.channel.PollableChannel; import org.springframework.integration.core.Message; +import org.springframework.integration.core.MessageChannel; import org.springframework.integration.message.GenericMessage; import org.springframework.integration.xml.config.StubResultFactory.StubStringResult; import org.springframework.xml.transform.StringResult; diff --git a/org.springframework.integration.xml/src/test/java/org/springframework/integration/xml/config/XmlUnmarshallingTransformerParserTests.java b/org.springframework.integration.xml/src/test/java/org/springframework/integration/xml/config/XmlUnmarshallingTransformerParserTests.java index 2a79f6d968..ce3398436c 100644 --- a/org.springframework.integration.xml/src/test/java/org/springframework/integration/xml/config/XmlUnmarshallingTransformerParserTests.java +++ b/org.springframework.integration.xml/src/test/java/org/springframework/integration/xml/config/XmlUnmarshallingTransformerParserTests.java @@ -26,9 +26,9 @@ import org.junit.Test; import org.springframework.context.ApplicationContext; import org.springframework.context.support.ClassPathXmlApplicationContext; -import org.springframework.integration.channel.MessageChannel; import org.springframework.integration.channel.PollableChannel; import org.springframework.integration.core.Message; +import org.springframework.integration.core.MessageChannel; import org.springframework.integration.message.GenericMessage; import org.springframework.integration.message.MessagingException; import org.springframework.integration.xml.util.XmlTestUtil; diff --git a/org.springframework.integration.xml/src/test/java/org/springframework/integration/xml/config/XsltPayloadTransformerParserTests.java b/org.springframework.integration.xml/src/test/java/org/springframework/integration/xml/config/XsltPayloadTransformerParserTests.java index 09bc8e6deb..0814f9c1ca 100644 --- a/org.springframework.integration.xml/src/test/java/org/springframework/integration/xml/config/XsltPayloadTransformerParserTests.java +++ b/org.springframework.integration.xml/src/test/java/org/springframework/integration/xml/config/XsltPayloadTransformerParserTests.java @@ -27,9 +27,9 @@ import org.w3c.dom.Document; import org.springframework.context.ApplicationContext; import org.springframework.context.support.ClassPathXmlApplicationContext; -import org.springframework.integration.channel.MessageChannel; import org.springframework.integration.channel.PollableChannel; import org.springframework.integration.core.Message; +import org.springframework.integration.core.MessageChannel; import org.springframework.integration.message.GenericMessage; import org.springframework.integration.xml.config.StubResultFactory.StubStringResult; import org.springframework.integration.xml.util.XmlTestUtil; diff --git a/org.springframework.integration/src/main/java/org/springframework/integration/aggregator/AbstractMessageBarrierConsumer.java b/org.springframework.integration/src/main/java/org/springframework/integration/aggregator/AbstractMessageBarrierConsumer.java index ecbb90c08c..86a17c0aa0 100644 --- a/org.springframework.integration/src/main/java/org/springframework/integration/aggregator/AbstractMessageBarrierConsumer.java +++ b/org.springframework.integration/src/main/java/org/springframework/integration/aggregator/AbstractMessageBarrierConsumer.java @@ -29,9 +29,9 @@ import org.apache.commons.logging.Log; import org.apache.commons.logging.LogFactory; import org.springframework.beans.factory.InitializingBean; -import org.springframework.integration.channel.MessageChannel; import org.springframework.integration.channel.MessageChannelTemplate; import org.springframework.integration.core.Message; +import org.springframework.integration.core.MessageChannel; import org.springframework.integration.endpoint.AbstractMessageConsumer; import org.springframework.integration.message.MessageConsumer; import org.springframework.integration.message.MessageHandlingException; diff --git a/org.springframework.integration/src/main/java/org/springframework/integration/annotation/Router.java b/org.springframework.integration/src/main/java/org/springframework/integration/annotation/Router.java index e03ccc8e3b..bdf677c96c 100644 --- a/org.springframework.integration/src/main/java/org/springframework/integration/annotation/Router.java +++ b/org.springframework.integration/src/main/java/org/springframework/integration/annotation/Router.java @@ -36,7 +36,7 @@ import java.lang.annotation.Target; *

* Return values from the annotated method may be either a Collection or Array * whose elements are either - * {@link org.springframework.integration.channel.MessageChannel channels} or + * {@link org.springframework.integration.core.MessageChannel channels} or * Strings. In the latter case, the endpoint hosting this router will attempt * to resolve each channel name with the Channel Registry. * diff --git a/org.springframework.integration/src/main/java/org/springframework/integration/aop/AnnotationAwareMessagePublishingInterceptor.java b/org.springframework.integration/src/main/java/org/springframework/integration/aop/AnnotationAwareMessagePublishingInterceptor.java index a5e800b59c..6426c981a6 100644 --- a/org.springframework.integration/src/main/java/org/springframework/integration/aop/AnnotationAwareMessagePublishingInterceptor.java +++ b/org.springframework.integration/src/main/java/org/springframework/integration/aop/AnnotationAwareMessagePublishingInterceptor.java @@ -24,7 +24,7 @@ import org.aopalliance.intercept.MethodInvocation; import org.springframework.aop.support.AopUtils; import org.springframework.core.annotation.AnnotationUtils; import org.springframework.integration.channel.ChannelResolver; -import org.springframework.integration.channel.MessageChannel; +import org.springframework.integration.core.MessageChannel; import org.springframework.util.Assert; /** diff --git a/org.springframework.integration/src/main/java/org/springframework/integration/aop/MessagePublishingInterceptor.java b/org.springframework.integration/src/main/java/org/springframework/integration/aop/MessagePublishingInterceptor.java index 31931db713..b54d616716 100644 --- a/org.springframework.integration/src/main/java/org/springframework/integration/aop/MessagePublishingInterceptor.java +++ b/org.springframework.integration/src/main/java/org/springframework/integration/aop/MessagePublishingInterceptor.java @@ -21,9 +21,9 @@ import org.aopalliance.intercept.MethodInvocation; import org.apache.commons.logging.Log; import org.apache.commons.logging.LogFactory; -import org.springframework.integration.channel.MessageChannel; import org.springframework.integration.channel.MessageChannelTemplate; import org.springframework.integration.core.Message; +import org.springframework.integration.core.MessageChannel; import org.springframework.integration.message.MessageBuilder; import org.springframework.util.Assert; diff --git a/org.springframework.integration/src/main/java/org/springframework/integration/bus/DefaultErrorChannel.java b/org.springframework.integration/src/main/java/org/springframework/integration/bus/DefaultErrorChannel.java index 9b29b7f69f..32045ba125 100644 --- a/org.springframework.integration/src/main/java/org/springframework/integration/bus/DefaultErrorChannel.java +++ b/org.springframework.integration/src/main/java/org/springframework/integration/bus/DefaultErrorChannel.java @@ -19,10 +19,10 @@ package org.springframework.integration.bus; import org.apache.commons.logging.Log; import org.apache.commons.logging.LogFactory; -import org.springframework.integration.channel.MessageChannel; import org.springframework.integration.channel.RendezvousChannel; import org.springframework.integration.channel.interceptor.ChannelInterceptorAdapter; import org.springframework.integration.core.Message; +import org.springframework.integration.core.MessageChannel; /** * The default error channel implementation used by the {@link MessageBus}. diff --git a/org.springframework.integration/src/main/java/org/springframework/integration/bus/DefaultMessageBus.java b/org.springframework.integration/src/main/java/org/springframework/integration/bus/DefaultMessageBus.java index e8de119e25..d9cbc25ce9 100644 --- a/org.springframework.integration/src/main/java/org/springframework/integration/bus/DefaultMessageBus.java +++ b/org.springframework.integration/src/main/java/org/springframework/integration/bus/DefaultMessageBus.java @@ -34,8 +34,8 @@ import org.springframework.context.ApplicationEvent; import org.springframework.context.ApplicationListener; import org.springframework.context.Lifecycle; import org.springframework.context.event.ContextRefreshedEvent; -import org.springframework.integration.channel.MessageChannel; import org.springframework.integration.channel.MessagePublishingErrorHandler; +import org.springframework.integration.core.MessageChannel; import org.springframework.integration.endpoint.MessageEndpoint; import org.springframework.integration.scheduling.SimpleTaskScheduler; import org.springframework.integration.scheduling.TaskScheduler; diff --git a/org.springframework.integration/src/main/java/org/springframework/integration/channel/AbstractMessageChannel.java b/org.springframework.integration/src/main/java/org/springframework/integration/channel/AbstractMessageChannel.java index 80799920cc..7e2c3e7670 100644 --- a/org.springframework.integration/src/main/java/org/springframework/integration/channel/AbstractMessageChannel.java +++ b/org.springframework.integration/src/main/java/org/springframework/integration/channel/AbstractMessageChannel.java @@ -24,6 +24,7 @@ import org.apache.commons.logging.LogFactory; import org.springframework.beans.factory.BeanNameAware; import org.springframework.integration.core.Message; +import org.springframework.integration.core.MessageChannel; /** * Base class for {@link MessageChannel} implementations providing common diff --git a/org.springframework.integration/src/main/java/org/springframework/integration/channel/AbstractSubscribableChannel.java b/org.springframework.integration/src/main/java/org/springframework/integration/channel/AbstractSubscribableChannel.java index a03084b09b..34bc3a42e3 100644 --- a/org.springframework.integration/src/main/java/org/springframework/integration/channel/AbstractSubscribableChannel.java +++ b/org.springframework.integration/src/main/java/org/springframework/integration/channel/AbstractSubscribableChannel.java @@ -17,6 +17,7 @@ package org.springframework.integration.channel; import org.springframework.integration.core.Message; +import org.springframework.integration.core.MessageChannel; import org.springframework.integration.dispatcher.MessageDispatcher; import org.springframework.integration.message.MessageConsumer; import org.springframework.util.Assert; diff --git a/org.springframework.integration/src/main/java/org/springframework/integration/channel/BeanFactoryChannelResolver.java b/org.springframework.integration/src/main/java/org/springframework/integration/channel/BeanFactoryChannelResolver.java index 66e58c23ef..056adf9b69 100644 --- a/org.springframework.integration/src/main/java/org/springframework/integration/channel/BeanFactoryChannelResolver.java +++ b/org.springframework.integration/src/main/java/org/springframework/integration/channel/BeanFactoryChannelResolver.java @@ -19,6 +19,7 @@ package org.springframework.integration.channel; import org.springframework.beans.BeansException; import org.springframework.beans.factory.BeanFactory; import org.springframework.beans.factory.BeanFactoryAware; +import org.springframework.integration.core.MessageChannel; import org.springframework.util.Assert; /** diff --git a/org.springframework.integration/src/main/java/org/springframework/integration/channel/BlockingChannel.java b/org.springframework.integration/src/main/java/org/springframework/integration/channel/BlockingChannel.java index c38dfba66f..d2caf4ea01 100644 --- a/org.springframework.integration/src/main/java/org/springframework/integration/channel/BlockingChannel.java +++ b/org.springframework.integration/src/main/java/org/springframework/integration/channel/BlockingChannel.java @@ -17,6 +17,7 @@ package org.springframework.integration.channel; import org.springframework.integration.core.Message; +import org.springframework.integration.core.MessageChannel; /** * Extends the base MessageChannel interface for channels that may block when a diff --git a/org.springframework.integration/src/main/java/org/springframework/integration/channel/ChannelInterceptor.java b/org.springframework.integration/src/main/java/org/springframework/integration/channel/ChannelInterceptor.java index 569f46de37..1b8acafdcb 100644 --- a/org.springframework.integration/src/main/java/org/springframework/integration/channel/ChannelInterceptor.java +++ b/org.springframework.integration/src/main/java/org/springframework/integration/channel/ChannelInterceptor.java @@ -17,6 +17,7 @@ package org.springframework.integration.channel; import org.springframework.integration.core.Message; +import org.springframework.integration.core.MessageChannel; /** * Interface for interceptors that are able to view and/or modify the diff --git a/org.springframework.integration/src/main/java/org/springframework/integration/channel/ChannelResolver.java b/org.springframework.integration/src/main/java/org/springframework/integration/channel/ChannelResolver.java index 68c193515a..e91841636b 100644 --- a/org.springframework.integration/src/main/java/org/springframework/integration/channel/ChannelResolver.java +++ b/org.springframework.integration/src/main/java/org/springframework/integration/channel/ChannelResolver.java @@ -16,6 +16,8 @@ package org.springframework.integration.channel; +import org.springframework.integration.core.MessageChannel; + /** * Strategy for resolving a name to a {@link MessageChannel}. diff --git a/org.springframework.integration/src/main/java/org/springframework/integration/channel/MapBasedChannelResolver.java b/org.springframework.integration/src/main/java/org/springframework/integration/channel/MapBasedChannelResolver.java index 9251a45edb..6db3672139 100644 --- a/org.springframework.integration/src/main/java/org/springframework/integration/channel/MapBasedChannelResolver.java +++ b/org.springframework.integration/src/main/java/org/springframework/integration/channel/MapBasedChannelResolver.java @@ -19,6 +19,7 @@ package org.springframework.integration.channel; import java.util.HashMap; import java.util.Map; +import org.springframework.integration.core.MessageChannel; import org.springframework.util.Assert; /** diff --git a/org.springframework.integration/src/main/java/org/springframework/integration/channel/MessageChannelTemplate.java b/org.springframework.integration/src/main/java/org/springframework/integration/channel/MessageChannelTemplate.java index f78108b9ef..0dde77a304 100644 --- a/org.springframework.integration/src/main/java/org/springframework/integration/channel/MessageChannelTemplate.java +++ b/org.springframework.integration/src/main/java/org/springframework/integration/channel/MessageChannelTemplate.java @@ -25,6 +25,7 @@ import org.apache.commons.logging.LogFactory; import org.springframework.beans.factory.InitializingBean; import org.springframework.integration.core.Message; +import org.springframework.integration.core.MessageChannel; import org.springframework.integration.message.MessageBuilder; import org.springframework.integration.selector.MessageSelector; import org.springframework.transaction.PlatformTransactionManager; diff --git a/org.springframework.integration/src/main/java/org/springframework/integration/channel/MessagePublishingErrorHandler.java b/org.springframework.integration/src/main/java/org/springframework/integration/channel/MessagePublishingErrorHandler.java index 5676b13947..beec35646d 100644 --- a/org.springframework.integration/src/main/java/org/springframework/integration/channel/MessagePublishingErrorHandler.java +++ b/org.springframework.integration/src/main/java/org/springframework/integration/channel/MessagePublishingErrorHandler.java @@ -19,6 +19,7 @@ package org.springframework.integration.channel; import org.apache.commons.logging.Log; import org.apache.commons.logging.LogFactory; +import org.springframework.integration.core.MessageChannel; import org.springframework.integration.message.ErrorMessage; import org.springframework.integration.message.MessagingException; import org.springframework.integration.util.ErrorHandler; diff --git a/org.springframework.integration/src/main/java/org/springframework/integration/channel/PollableChannel.java b/org.springframework.integration/src/main/java/org/springframework/integration/channel/PollableChannel.java index 2d11522297..e724daa671 100644 --- a/org.springframework.integration/src/main/java/org/springframework/integration/channel/PollableChannel.java +++ b/org.springframework.integration/src/main/java/org/springframework/integration/channel/PollableChannel.java @@ -19,6 +19,7 @@ package org.springframework.integration.channel; import java.util.List; import org.springframework.integration.core.Message; +import org.springframework.integration.core.MessageChannel; import org.springframework.integration.selector.MessageSelector; /** diff --git a/org.springframework.integration/src/main/java/org/springframework/integration/channel/SubscribableChannel.java b/org.springframework.integration/src/main/java/org/springframework/integration/channel/SubscribableChannel.java index 965aec6881..841d20ac8d 100644 --- a/org.springframework.integration/src/main/java/org/springframework/integration/channel/SubscribableChannel.java +++ b/org.springframework.integration/src/main/java/org/springframework/integration/channel/SubscribableChannel.java @@ -16,6 +16,7 @@ package org.springframework.integration.channel; +import org.springframework.integration.core.MessageChannel; import org.springframework.integration.message.MessageConsumer; /** diff --git a/org.springframework.integration/src/main/java/org/springframework/integration/channel/interceptor/ChannelInterceptorAdapter.java b/org.springframework.integration/src/main/java/org/springframework/integration/channel/interceptor/ChannelInterceptorAdapter.java index 21dcbf798c..cb7bfad048 100644 --- a/org.springframework.integration/src/main/java/org/springframework/integration/channel/interceptor/ChannelInterceptorAdapter.java +++ b/org.springframework.integration/src/main/java/org/springframework/integration/channel/interceptor/ChannelInterceptorAdapter.java @@ -17,8 +17,8 @@ package org.springframework.integration.channel.interceptor; import org.springframework.integration.channel.ChannelInterceptor; -import org.springframework.integration.channel.MessageChannel; import org.springframework.integration.core.Message; +import org.springframework.integration.core.MessageChannel; /** * A {@link ChannelInterceptor} with no-op method implementations so that diff --git a/org.springframework.integration/src/main/java/org/springframework/integration/channel/interceptor/MessageSelectingInterceptor.java b/org.springframework.integration/src/main/java/org/springframework/integration/channel/interceptor/MessageSelectingInterceptor.java index 3792785453..c74b394374 100644 --- a/org.springframework.integration/src/main/java/org/springframework/integration/channel/interceptor/MessageSelectingInterceptor.java +++ b/org.springframework.integration/src/main/java/org/springframework/integration/channel/interceptor/MessageSelectingInterceptor.java @@ -19,8 +19,8 @@ package org.springframework.integration.channel.interceptor; import java.util.Arrays; import java.util.List; -import org.springframework.integration.channel.MessageChannel; import org.springframework.integration.core.Message; +import org.springframework.integration.core.MessageChannel; import org.springframework.integration.message.MessageDeliveryException; import org.springframework.integration.selector.MessageSelector; diff --git a/org.springframework.integration/src/main/java/org/springframework/integration/channel/interceptor/MessageStoringInterceptor.java b/org.springframework.integration/src/main/java/org/springframework/integration/channel/interceptor/MessageStoringInterceptor.java index 208c0b3ea1..00120ff9e9 100644 --- a/org.springframework.integration/src/main/java/org/springframework/integration/channel/interceptor/MessageStoringInterceptor.java +++ b/org.springframework.integration/src/main/java/org/springframework/integration/channel/interceptor/MessageStoringInterceptor.java @@ -23,8 +23,8 @@ import org.apache.commons.logging.LogFactory; import org.springframework.integration.channel.BlockingChannel; import org.springframework.integration.channel.ChannelInterceptor; -import org.springframework.integration.channel.MessageChannel; import org.springframework.integration.core.Message; +import org.springframework.integration.core.MessageChannel; import org.springframework.integration.message.MessageStore; import org.springframework.integration.message.MessagingException; import org.springframework.util.Assert; diff --git a/org.springframework.integration/src/main/java/org/springframework/integration/channel/interceptor/WireTap.java b/org.springframework.integration/src/main/java/org/springframework/integration/channel/interceptor/WireTap.java index d28a078840..4e7d21928f 100644 --- a/org.springframework.integration/src/main/java/org/springframework/integration/channel/interceptor/WireTap.java +++ b/org.springframework.integration/src/main/java/org/springframework/integration/channel/interceptor/WireTap.java @@ -22,8 +22,8 @@ import org.apache.commons.logging.LogFactory; import org.springframework.context.Lifecycle; import org.springframework.integration.channel.BlockingChannel; import org.springframework.integration.channel.ChannelInterceptor; -import org.springframework.integration.channel.MessageChannel; import org.springframework.integration.core.Message; +import org.springframework.integration.core.MessageChannel; import org.springframework.integration.selector.MessageSelector; import org.springframework.util.Assert; diff --git a/org.springframework.integration/src/main/java/org/springframework/integration/config/AbstractConsumerFactoryBean.java b/org.springframework.integration/src/main/java/org/springframework/integration/config/AbstractConsumerFactoryBean.java index 91707c43d6..70469b5d25 100644 --- a/org.springframework.integration/src/main/java/org/springframework/integration/config/AbstractConsumerFactoryBean.java +++ b/org.springframework.integration/src/main/java/org/springframework/integration/config/AbstractConsumerFactoryBean.java @@ -17,7 +17,7 @@ package org.springframework.integration.config; import org.springframework.beans.factory.FactoryBean; -import org.springframework.integration.channel.MessageChannel; +import org.springframework.integration.core.MessageChannel; import org.springframework.integration.endpoint.AbstractReplyProducingMessageConsumer; import org.springframework.integration.message.MessageConsumer; import org.springframework.util.Assert; diff --git a/org.springframework.integration/src/main/java/org/springframework/integration/config/ConsumerEndpointFactoryBean.java b/org.springframework.integration/src/main/java/org/springframework/integration/config/ConsumerEndpointFactoryBean.java index 04469385f1..e1fa3d08ef 100644 --- a/org.springframework.integration/src/main/java/org/springframework/integration/config/ConsumerEndpointFactoryBean.java +++ b/org.springframework.integration/src/main/java/org/springframework/integration/config/ConsumerEndpointFactoryBean.java @@ -23,9 +23,9 @@ import org.springframework.beans.factory.FactoryBean; import org.springframework.beans.factory.InitializingBean; import org.springframework.beans.factory.config.ConfigurableBeanFactory; import org.springframework.core.task.TaskExecutor; -import org.springframework.integration.channel.MessageChannel; import org.springframework.integration.channel.PollableChannel; import org.springframework.integration.channel.SubscribableChannel; +import org.springframework.integration.core.MessageChannel; import org.springframework.integration.endpoint.MessageEndpoint; import org.springframework.integration.endpoint.PollingConsumerEndpoint; import org.springframework.integration.endpoint.SubscribingConsumerEndpoint; diff --git a/org.springframework.integration/src/main/java/org/springframework/integration/config/annotation/AbstractMethodAnnotationPostProcessor.java b/org.springframework.integration/src/main/java/org/springframework/integration/config/annotation/AbstractMethodAnnotationPostProcessor.java index aacd2c0766..450835e821 100644 --- a/org.springframework.integration/src/main/java/org/springframework/integration/config/annotation/AbstractMethodAnnotationPostProcessor.java +++ b/org.springframework.integration/src/main/java/org/springframework/integration/config/annotation/AbstractMethodAnnotationPostProcessor.java @@ -27,9 +27,9 @@ import org.springframework.core.annotation.AnnotationUtils; import org.springframework.integration.annotation.Poller; import org.springframework.integration.channel.BeanFactoryChannelResolver; import org.springframework.integration.channel.ChannelResolver; -import org.springframework.integration.channel.MessageChannel; import org.springframework.integration.channel.PollableChannel; import org.springframework.integration.channel.SubscribableChannel; +import org.springframework.integration.core.MessageChannel; import org.springframework.integration.endpoint.MessageEndpoint; import org.springframework.integration.endpoint.PollingConsumerEndpoint; import org.springframework.integration.endpoint.SubscribingConsumerEndpoint; diff --git a/org.springframework.integration/src/main/java/org/springframework/integration/config/annotation/AggregatorAnnotationPostProcessor.java b/org.springframework.integration/src/main/java/org/springframework/integration/config/annotation/AggregatorAnnotationPostProcessor.java index 6ab8a3df98..e4ceb47c2a 100644 --- a/org.springframework.integration/src/main/java/org/springframework/integration/config/annotation/AggregatorAnnotationPostProcessor.java +++ b/org.springframework.integration/src/main/java/org/springframework/integration/config/annotation/AggregatorAnnotationPostProcessor.java @@ -26,7 +26,7 @@ import org.springframework.integration.aggregator.CompletionStrategyAdapter; import org.springframework.integration.aggregator.MethodInvokingAggregator; import org.springframework.integration.annotation.Aggregator; import org.springframework.integration.annotation.CompletionStrategy; -import org.springframework.integration.channel.MessageChannel; +import org.springframework.integration.core.MessageChannel; import org.springframework.integration.message.MessageConsumer; import org.springframework.util.Assert; import org.springframework.util.ReflectionUtils; diff --git a/org.springframework.integration/src/main/java/org/springframework/integration/config/annotation/ChannelAdapterAnnotationPostProcessor.java b/org.springframework.integration/src/main/java/org/springframework/integration/config/annotation/ChannelAdapterAnnotationPostProcessor.java index 0e31d07b07..4dede6bc83 100644 --- a/org.springframework.integration/src/main/java/org/springframework/integration/config/annotation/ChannelAdapterAnnotationPostProcessor.java +++ b/org.springframework.integration/src/main/java/org/springframework/integration/config/annotation/ChannelAdapterAnnotationPostProcessor.java @@ -26,9 +26,9 @@ import org.springframework.integration.channel.BeanFactoryChannelResolver; import org.springframework.integration.channel.ChannelResolutionException; import org.springframework.integration.channel.ChannelResolver; import org.springframework.integration.channel.DirectChannel; -import org.springframework.integration.channel.MessageChannel; import org.springframework.integration.channel.PollableChannel; import org.springframework.integration.channel.SubscribableChannel; +import org.springframework.integration.core.MessageChannel; import org.springframework.integration.endpoint.MessageEndpoint; import org.springframework.integration.endpoint.PollingConsumerEndpoint; import org.springframework.integration.endpoint.SourcePollingChannelAdapter; diff --git a/org.springframework.integration/src/main/java/org/springframework/integration/config/annotation/RouterAnnotationPostProcessor.java b/org.springframework.integration/src/main/java/org/springframework/integration/config/annotation/RouterAnnotationPostProcessor.java index 5e741ace4d..67eba4f16e 100644 --- a/org.springframework.integration/src/main/java/org/springframework/integration/config/annotation/RouterAnnotationPostProcessor.java +++ b/org.springframework.integration/src/main/java/org/springframework/integration/config/annotation/RouterAnnotationPostProcessor.java @@ -20,7 +20,7 @@ import java.lang.reflect.Method; import org.springframework.beans.factory.ListableBeanFactory; import org.springframework.integration.annotation.Router; -import org.springframework.integration.channel.MessageChannel; +import org.springframework.integration.core.MessageChannel; import org.springframework.integration.message.MessageConsumer; import org.springframework.integration.router.MethodInvokingRouter; import org.springframework.util.Assert; diff --git a/org.springframework.integration/src/main/java/org/springframework/integration/channel/MessageChannel.java b/org.springframework.integration/src/main/java/org/springframework/integration/core/MessageChannel.java similarity index 92% rename from org.springframework.integration/src/main/java/org/springframework/integration/channel/MessageChannel.java rename to org.springframework.integration/src/main/java/org/springframework/integration/core/MessageChannel.java index cede16a7fc..662bffd80c 100644 --- a/org.springframework.integration/src/main/java/org/springframework/integration/channel/MessageChannel.java +++ b/org.springframework.integration/src/main/java/org/springframework/integration/core/MessageChannel.java @@ -14,9 +14,8 @@ * limitations under the License. */ -package org.springframework.integration.channel; +package org.springframework.integration.core; -import org.springframework.integration.core.Message; /** * Base channel interface defining common behavior for message sending and receiving. diff --git a/org.springframework.integration/src/main/java/org/springframework/integration/endpoint/AbstractMessageProducingEndpoint.java b/org.springframework.integration/src/main/java/org/springframework/integration/endpoint/AbstractMessageProducingEndpoint.java index 807e9af55a..e490bbcaa4 100644 --- a/org.springframework.integration/src/main/java/org/springframework/integration/endpoint/AbstractMessageProducingEndpoint.java +++ b/org.springframework.integration/src/main/java/org/springframework/integration/endpoint/AbstractMessageProducingEndpoint.java @@ -17,9 +17,9 @@ package org.springframework.integration.endpoint; import org.springframework.beans.factory.InitializingBean; -import org.springframework.integration.channel.MessageChannel; import org.springframework.integration.channel.MessageChannelTemplate; import org.springframework.integration.core.Message; +import org.springframework.integration.core.MessageChannel; import org.springframework.util.Assert; /** diff --git a/org.springframework.integration/src/main/java/org/springframework/integration/endpoint/AbstractReplyProducingMessageConsumer.java b/org.springframework.integration/src/main/java/org/springframework/integration/endpoint/AbstractReplyProducingMessageConsumer.java index 90e4232341..b455dfaba5 100644 --- a/org.springframework.integration/src/main/java/org/springframework/integration/endpoint/AbstractReplyProducingMessageConsumer.java +++ b/org.springframework.integration/src/main/java/org/springframework/integration/endpoint/AbstractReplyProducingMessageConsumer.java @@ -20,9 +20,9 @@ import org.springframework.beans.factory.BeanFactory; import org.springframework.beans.factory.BeanFactoryAware; import org.springframework.integration.channel.BeanFactoryChannelResolver; import org.springframework.integration.channel.ChannelResolver; -import org.springframework.integration.channel.MessageChannel; import org.springframework.integration.channel.MessageChannelTemplate; import org.springframework.integration.core.Message; +import org.springframework.integration.core.MessageChannel; import org.springframework.integration.core.MessageHeaders; import org.springframework.integration.message.MessageBuilder; import org.springframework.integration.message.MessageHandlingException; diff --git a/org.springframework.integration/src/main/java/org/springframework/integration/endpoint/ReplyMessageHolder.java b/org.springframework.integration/src/main/java/org/springframework/integration/endpoint/ReplyMessageHolder.java index c674df80d8..080592cd54 100644 --- a/org.springframework.integration/src/main/java/org/springframework/integration/endpoint/ReplyMessageHolder.java +++ b/org.springframework.integration/src/main/java/org/springframework/integration/endpoint/ReplyMessageHolder.java @@ -20,8 +20,8 @@ import java.util.ArrayList; import java.util.Collections; import java.util.List; -import org.springframework.integration.channel.MessageChannel; import org.springframework.integration.core.Message; +import org.springframework.integration.core.MessageChannel; import org.springframework.integration.message.MessageBuilder; /** diff --git a/org.springframework.integration/src/main/java/org/springframework/integration/endpoint/SourcePollingChannelAdapter.java b/org.springframework.integration/src/main/java/org/springframework/integration/endpoint/SourcePollingChannelAdapter.java index c91eb0949f..0782b4ba65 100644 --- a/org.springframework.integration/src/main/java/org/springframework/integration/endpoint/SourcePollingChannelAdapter.java +++ b/org.springframework.integration/src/main/java/org/springframework/integration/endpoint/SourcePollingChannelAdapter.java @@ -17,9 +17,9 @@ package org.springframework.integration.endpoint; import org.springframework.beans.factory.BeanNameAware; -import org.springframework.integration.channel.MessageChannel; import org.springframework.integration.channel.MessageChannelTemplate; import org.springframework.integration.core.Message; +import org.springframework.integration.core.MessageChannel; import org.springframework.integration.message.MessageSource; import org.springframework.util.Assert; diff --git a/org.springframework.integration/src/main/java/org/springframework/integration/gateway/AbstractMessagingGateway.java b/org.springframework.integration/src/main/java/org/springframework/integration/gateway/AbstractMessagingGateway.java index 78102362fa..272bee7935 100644 --- a/org.springframework.integration/src/main/java/org/springframework/integration/gateway/AbstractMessagingGateway.java +++ b/org.springframework.integration/src/main/java/org/springframework/integration/gateway/AbstractMessagingGateway.java @@ -18,11 +18,11 @@ package org.springframework.integration.gateway; import org.springframework.integration.bus.MessageBus; import org.springframework.integration.bus.MessageBusAware; -import org.springframework.integration.channel.MessageChannel; import org.springframework.integration.channel.MessageChannelTemplate; import org.springframework.integration.channel.PollableChannel; import org.springframework.integration.channel.SubscribableChannel; import org.springframework.integration.core.Message; +import org.springframework.integration.core.MessageChannel; import org.springframework.integration.endpoint.AbstractReplyProducingMessageConsumer; import org.springframework.integration.endpoint.MessageEndpoint; import org.springframework.integration.endpoint.MessagingGateway; diff --git a/org.springframework.integration/src/main/java/org/springframework/integration/gateway/GatewayProxyFactoryBean.java b/org.springframework.integration/src/main/java/org/springframework/integration/gateway/GatewayProxyFactoryBean.java index 9956a3a82d..422a83c8e0 100644 --- a/org.springframework.integration/src/main/java/org/springframework/integration/gateway/GatewayProxyFactoryBean.java +++ b/org.springframework.integration/src/main/java/org/springframework/integration/gateway/GatewayProxyFactoryBean.java @@ -36,10 +36,10 @@ import org.springframework.integration.annotation.Gateway; import org.springframework.integration.bus.MessageBus; import org.springframework.integration.channel.BeanFactoryChannelResolver; import org.springframework.integration.channel.ChannelResolver; -import org.springframework.integration.channel.MessageChannel; import org.springframework.integration.channel.PollableChannel; import org.springframework.integration.config.xml.MessageBusParser; import org.springframework.integration.core.Message; +import org.springframework.integration.core.MessageChannel; import org.springframework.integration.endpoint.MessagingGateway; import org.springframework.integration.message.MethodParameterMessageMapper; import org.springframework.util.Assert; diff --git a/org.springframework.integration/src/main/java/org/springframework/integration/message/MessageBuilder.java b/org.springframework.integration/src/main/java/org/springframework/integration/message/MessageBuilder.java index e8ce6c0eae..4d0a5a587d 100644 --- a/org.springframework.integration/src/main/java/org/springframework/integration/message/MessageBuilder.java +++ b/org.springframework.integration/src/main/java/org/springframework/integration/message/MessageBuilder.java @@ -21,8 +21,8 @@ import java.util.HashMap; import java.util.Map; import java.util.Set; -import org.springframework.integration.channel.MessageChannel; import org.springframework.integration.core.Message; +import org.springframework.integration.core.MessageChannel; import org.springframework.integration.core.MessageHeaders; import org.springframework.integration.core.MessagePriority; import org.springframework.util.Assert; diff --git a/org.springframework.integration/src/main/java/org/springframework/integration/message/MessageProducer.java b/org.springframework.integration/src/main/java/org/springframework/integration/message/MessageProducer.java index 950619afb5..9ceb1aab51 100644 --- a/org.springframework.integration/src/main/java/org/springframework/integration/message/MessageProducer.java +++ b/org.springframework.integration/src/main/java/org/springframework/integration/message/MessageProducer.java @@ -16,7 +16,7 @@ package org.springframework.integration.message; -import org.springframework.integration.channel.MessageChannel; +import org.springframework.integration.core.MessageChannel; /** * Base interface for any component that produces Messages. diff --git a/org.springframework.integration/src/main/java/org/springframework/integration/router/AbstractChannelNameResolvingMessageRouter.java b/org.springframework.integration/src/main/java/org/springframework/integration/router/AbstractChannelNameResolvingMessageRouter.java index dfaab85ae0..3145fc6f24 100644 --- a/org.springframework.integration/src/main/java/org/springframework/integration/router/AbstractChannelNameResolvingMessageRouter.java +++ b/org.springframework.integration/src/main/java/org/springframework/integration/router/AbstractChannelNameResolvingMessageRouter.java @@ -24,8 +24,8 @@ import org.springframework.beans.factory.BeanFactoryAware; import org.springframework.beans.factory.InitializingBean; import org.springframework.integration.channel.BeanFactoryChannelResolver; import org.springframework.integration.channel.ChannelResolver; -import org.springframework.integration.channel.MessageChannel; import org.springframework.integration.core.Message; +import org.springframework.integration.core.MessageChannel; import org.springframework.integration.message.MessagingException; import org.springframework.util.Assert; diff --git a/org.springframework.integration/src/main/java/org/springframework/integration/router/AbstractMessageRouter.java b/org.springframework.integration/src/main/java/org/springframework/integration/router/AbstractMessageRouter.java index a26ebca8ef..b1830b48dd 100644 --- a/org.springframework.integration/src/main/java/org/springframework/integration/router/AbstractMessageRouter.java +++ b/org.springframework.integration/src/main/java/org/springframework/integration/router/AbstractMessageRouter.java @@ -18,9 +18,9 @@ package org.springframework.integration.router; import java.util.Collection; -import org.springframework.integration.channel.MessageChannel; import org.springframework.integration.channel.MessageChannelTemplate; import org.springframework.integration.core.Message; +import org.springframework.integration.core.MessageChannel; import org.springframework.integration.endpoint.AbstractMessageConsumer; import org.springframework.integration.message.MessageDeliveryException; diff --git a/org.springframework.integration/src/main/java/org/springframework/integration/router/AbstractSingleChannelRouter.java b/org.springframework.integration/src/main/java/org/springframework/integration/router/AbstractSingleChannelRouter.java index dc16fc081f..be54f56583 100644 --- a/org.springframework.integration/src/main/java/org/springframework/integration/router/AbstractSingleChannelRouter.java +++ b/org.springframework.integration/src/main/java/org/springframework/integration/router/AbstractSingleChannelRouter.java @@ -19,8 +19,8 @@ package org.springframework.integration.router; import java.util.Collection; import java.util.Collections; -import org.springframework.integration.channel.MessageChannel; import org.springframework.integration.core.Message; +import org.springframework.integration.core.MessageChannel; /** * Extends {@link AbstractMessageRouter} to support router implementations that diff --git a/org.springframework.integration/src/main/java/org/springframework/integration/router/ErrorMessageExceptionTypeRouter.java b/org.springframework.integration/src/main/java/org/springframework/integration/router/ErrorMessageExceptionTypeRouter.java index f364ce0a0b..c1c1bee1e3 100644 --- a/org.springframework.integration/src/main/java/org/springframework/integration/router/ErrorMessageExceptionTypeRouter.java +++ b/org.springframework.integration/src/main/java/org/springframework/integration/router/ErrorMessageExceptionTypeRouter.java @@ -19,8 +19,8 @@ package org.springframework.integration.router; import java.util.Map; import java.util.concurrent.ConcurrentHashMap; -import org.springframework.integration.channel.MessageChannel; import org.springframework.integration.core.Message; +import org.springframework.integration.core.MessageChannel; import org.springframework.util.Assert; /** diff --git a/org.springframework.integration/src/main/java/org/springframework/integration/router/MethodInvokingRouter.java b/org.springframework.integration/src/main/java/org/springframework/integration/router/MethodInvokingRouter.java index 83f1b29291..df081dd105 100644 --- a/org.springframework.integration/src/main/java/org/springframework/integration/router/MethodInvokingRouter.java +++ b/org.springframework.integration/src/main/java/org/springframework/integration/router/MethodInvokingRouter.java @@ -24,8 +24,8 @@ import java.util.List; import org.springframework.beans.factory.InitializingBean; import org.springframework.integration.channel.ChannelResolver; -import org.springframework.integration.channel.MessageChannel; import org.springframework.integration.core.Message; +import org.springframework.integration.core.MessageChannel; import org.springframework.integration.message.MessageMappingMethodInvoker; import org.springframework.integration.message.MessagingException; import org.springframework.util.Assert; diff --git a/org.springframework.integration/src/main/java/org/springframework/integration/router/PayloadTypeRouter.java b/org.springframework.integration/src/main/java/org/springframework/integration/router/PayloadTypeRouter.java index 7ab8a7fffd..e87e134b31 100644 --- a/org.springframework.integration/src/main/java/org/springframework/integration/router/PayloadTypeRouter.java +++ b/org.springframework.integration/src/main/java/org/springframework/integration/router/PayloadTypeRouter.java @@ -19,8 +19,8 @@ package org.springframework.integration.router; import java.util.Map; import java.util.concurrent.ConcurrentHashMap; -import org.springframework.integration.channel.MessageChannel; import org.springframework.integration.core.Message; +import org.springframework.integration.core.MessageChannel; import org.springframework.util.Assert; /** diff --git a/org.springframework.integration/src/main/java/org/springframework/integration/router/RecipientListRouter.java b/org.springframework.integration/src/main/java/org/springframework/integration/router/RecipientListRouter.java index 11882e2602..d14e896e75 100644 --- a/org.springframework.integration/src/main/java/org/springframework/integration/router/RecipientListRouter.java +++ b/org.springframework.integration/src/main/java/org/springframework/integration/router/RecipientListRouter.java @@ -20,8 +20,8 @@ import java.util.Collection; import java.util.List; import org.springframework.beans.factory.InitializingBean; -import org.springframework.integration.channel.MessageChannel; import org.springframework.integration.core.Message; +import org.springframework.integration.core.MessageChannel; import org.springframework.util.Assert; /** diff --git a/org.springframework.integration/src/main/java/org/springframework/integration/transformer/MessageTransformingChannelInterceptor.java b/org.springframework.integration/src/main/java/org/springframework/integration/transformer/MessageTransformingChannelInterceptor.java index 9b6edb3971..e96b81ef40 100644 --- a/org.springframework.integration/src/main/java/org/springframework/integration/transformer/MessageTransformingChannelInterceptor.java +++ b/org.springframework.integration/src/main/java/org/springframework/integration/transformer/MessageTransformingChannelInterceptor.java @@ -17,9 +17,9 @@ package org.springframework.integration.transformer; import org.springframework.integration.channel.ChannelInterceptor; -import org.springframework.integration.channel.MessageChannel; import org.springframework.integration.channel.interceptor.ChannelInterceptorAdapter; import org.springframework.integration.core.Message; +import org.springframework.integration.core.MessageChannel; /** * A {@link ChannelInterceptor} which invokes a {@link Transformer} diff --git a/org.springframework.integration/src/test/java/org/springframework/integration/aggregator/AggregatorEndpointTests.java b/org.springframework.integration/src/test/java/org/springframework/integration/aggregator/AggregatorEndpointTests.java index de587df77d..ff1effcccb 100644 --- a/org.springframework.integration/src/test/java/org/springframework/integration/aggregator/AggregatorEndpointTests.java +++ b/org.springframework.integration/src/test/java/org/springframework/integration/aggregator/AggregatorEndpointTests.java @@ -33,9 +33,9 @@ import org.junit.Test; import org.springframework.core.task.SimpleAsyncTaskExecutor; import org.springframework.core.task.TaskExecutor; -import org.springframework.integration.channel.MessageChannel; import org.springframework.integration.channel.QueueChannel; import org.springframework.integration.core.Message; +import org.springframework.integration.core.MessageChannel; import org.springframework.integration.message.MessageBuilder; import org.springframework.integration.message.MessageHandlingException; import org.springframework.integration.message.StringMessage; diff --git a/org.springframework.integration/src/test/java/org/springframework/integration/aggregator/ResequencerTests.java b/org.springframework.integration/src/test/java/org/springframework/integration/aggregator/ResequencerTests.java index 58a37bf30f..3fd4094b37 100644 --- a/org.springframework.integration/src/test/java/org/springframework/integration/aggregator/ResequencerTests.java +++ b/org.springframework.integration/src/test/java/org/springframework/integration/aggregator/ResequencerTests.java @@ -24,9 +24,9 @@ import org.junit.After; import org.junit.Before; import org.junit.Test; -import org.springframework.integration.channel.MessageChannel; import org.springframework.integration.channel.QueueChannel; import org.springframework.integration.core.Message; +import org.springframework.integration.core.MessageChannel; import org.springframework.integration.message.MessageBuilder; import org.springframework.integration.scheduling.TaskScheduler; import org.springframework.integration.util.TestUtils; diff --git a/org.springframework.integration/src/test/java/org/springframework/integration/aggregator/integration/ConcurrentAggregatorIntegrationTests.java b/org.springframework.integration/src/test/java/org/springframework/integration/aggregator/integration/ConcurrentAggregatorIntegrationTests.java index 481c782c58..f1a7325db0 100644 --- a/org.springframework.integration/src/test/java/org/springframework/integration/aggregator/integration/ConcurrentAggregatorIntegrationTests.java +++ b/org.springframework.integration/src/test/java/org/springframework/integration/aggregator/integration/ConcurrentAggregatorIntegrationTests.java @@ -10,8 +10,8 @@ import org.junit.Test; import org.junit.runner.RunWith; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.beans.factory.annotation.Qualifier; -import org.springframework.integration.channel.MessageChannel; import org.springframework.integration.channel.PollableChannel; +import org.springframework.integration.core.MessageChannel; import org.springframework.integration.core.MessageHeaders; import org.springframework.integration.message.GenericMessage; import org.springframework.test.context.ContextConfiguration; diff --git a/org.springframework.integration/src/test/java/org/springframework/integration/bus/DefaultMessageBusTests.java b/org.springframework.integration/src/test/java/org/springframework/integration/bus/DefaultMessageBusTests.java index f26159fed6..44d481e4eb 100644 --- a/org.springframework.integration/src/test/java/org/springframework/integration/bus/DefaultMessageBusTests.java +++ b/org.springframework.integration/src/test/java/org/springframework/integration/bus/DefaultMessageBusTests.java @@ -30,12 +30,12 @@ import org.junit.Test; import org.springframework.beans.factory.BeanCreationException; import org.springframework.context.support.ClassPathXmlApplicationContext; import org.springframework.context.support.GenericApplicationContext; -import org.springframework.integration.channel.MessageChannel; import org.springframework.integration.channel.PollableChannel; import org.springframework.integration.channel.PublishSubscribeChannel; import org.springframework.integration.channel.QueueChannel; import org.springframework.integration.config.xml.MessageBusParser; import org.springframework.integration.core.Message; +import org.springframework.integration.core.MessageChannel; import org.springframework.integration.endpoint.AbstractReplyProducingMessageConsumer; import org.springframework.integration.endpoint.PollingConsumerEndpoint; import org.springframework.integration.endpoint.ReplyMessageHolder; diff --git a/org.springframework.integration/src/test/java/org/springframework/integration/channel/MapBasedChannelResolverTests.java b/org.springframework.integration/src/test/java/org/springframework/integration/channel/MapBasedChannelResolverTests.java index 2bb8ce2a93..f135c31928 100644 --- a/org.springframework.integration/src/test/java/org/springframework/integration/channel/MapBasedChannelResolverTests.java +++ b/org.springframework.integration/src/test/java/org/springframework/integration/channel/MapBasedChannelResolverTests.java @@ -25,6 +25,8 @@ import java.util.Map; import org.junit.Test; +import org.springframework.integration.core.MessageChannel; + /** * @author Mark Fisher */ diff --git a/org.springframework.integration/src/test/java/org/springframework/integration/channel/MessageChannelTemplateTests.java b/org.springframework.integration/src/test/java/org/springframework/integration/channel/MessageChannelTemplateTests.java index 010e43ec0c..b4393458db 100644 --- a/org.springframework.integration/src/test/java/org/springframework/integration/channel/MessageChannelTemplateTests.java +++ b/org.springframework.integration/src/test/java/org/springframework/integration/channel/MessageChannelTemplateTests.java @@ -32,6 +32,7 @@ import org.junit.Test; import org.springframework.context.support.GenericApplicationContext; import org.springframework.integration.bus.DefaultMessageBus; import org.springframework.integration.core.Message; +import org.springframework.integration.core.MessageChannel; import org.springframework.integration.endpoint.AbstractReplyProducingMessageConsumer; import org.springframework.integration.endpoint.PollingConsumerEndpoint; import org.springframework.integration.endpoint.ReplyMessageHolder; diff --git a/org.springframework.integration/src/test/java/org/springframework/integration/channel/TestChannelResolver.java b/org.springframework.integration/src/test/java/org/springframework/integration/channel/TestChannelResolver.java index c51bd36067..e54421ab18 100644 --- a/org.springframework.integration/src/test/java/org/springframework/integration/channel/TestChannelResolver.java +++ b/org.springframework.integration/src/test/java/org/springframework/integration/channel/TestChannelResolver.java @@ -20,6 +20,7 @@ import java.util.Map; import java.util.concurrent.ConcurrentHashMap; import org.springframework.beans.factory.annotation.Autowired; +import org.springframework.integration.core.MessageChannel; import org.springframework.util.Assert; /** diff --git a/org.springframework.integration/src/test/java/org/springframework/integration/channel/config/ChannelParserTests.java b/org.springframework.integration/src/test/java/org/springframework/integration/channel/config/ChannelParserTests.java index 8f89c86898..a31df69e49 100644 --- a/org.springframework.integration/src/test/java/org/springframework/integration/channel/config/ChannelParserTests.java +++ b/org.springframework.integration/src/test/java/org/springframework/integration/channel/config/ChannelParserTests.java @@ -28,11 +28,11 @@ import org.springframework.context.ApplicationContext; import org.springframework.context.support.ClassPathXmlApplicationContext; import org.springframework.integration.channel.BlockingChannel; import org.springframework.integration.channel.DirectChannel; -import org.springframework.integration.channel.MessageChannel; import org.springframework.integration.channel.PollableChannel; import org.springframework.integration.channel.PublishSubscribeChannel; import org.springframework.integration.config.TestChannelInterceptor; import org.springframework.integration.core.Message; +import org.springframework.integration.core.MessageChannel; import org.springframework.integration.core.MessagePriority; import org.springframework.integration.message.GenericMessage; import org.springframework.integration.message.MessageBuilder; diff --git a/org.springframework.integration/src/test/java/org/springframework/integration/channel/config/RendezvousChannelParserTests.java b/org.springframework.integration/src/test/java/org/springframework/integration/channel/config/RendezvousChannelParserTests.java index 7f13e2370d..1e9ffed716 100644 --- a/org.springframework.integration/src/test/java/org/springframework/integration/channel/config/RendezvousChannelParserTests.java +++ b/org.springframework.integration/src/test/java/org/springframework/integration/channel/config/RendezvousChannelParserTests.java @@ -21,8 +21,8 @@ import static org.junit.Assert.assertEquals; import org.junit.Test; import org.springframework.context.support.ClassPathXmlApplicationContext; -import org.springframework.integration.channel.MessageChannel; import org.springframework.integration.channel.RendezvousChannel; +import org.springframework.integration.core.MessageChannel; /** * @author Mark Fisher diff --git a/org.springframework.integration/src/test/java/org/springframework/integration/channel/config/ThreadLocalChannelParserTests.java b/org.springframework.integration/src/test/java/org/springframework/integration/channel/config/ThreadLocalChannelParserTests.java index 7e9005f497..6d9f3f1d35 100644 --- a/org.springframework.integration/src/test/java/org/springframework/integration/channel/config/ThreadLocalChannelParserTests.java +++ b/org.springframework.integration/src/test/java/org/springframework/integration/channel/config/ThreadLocalChannelParserTests.java @@ -21,8 +21,8 @@ import static org.junit.Assert.assertEquals; import org.junit.Test; import org.springframework.context.support.ClassPathXmlApplicationContext; -import org.springframework.integration.channel.MessageChannel; import org.springframework.integration.channel.ThreadLocalChannel; +import org.springframework.integration.core.MessageChannel; /** * @author Mark Fisher diff --git a/org.springframework.integration/src/test/java/org/springframework/integration/channel/interceptor/ChannelInterceptorTests.java b/org.springframework.integration/src/test/java/org/springframework/integration/channel/interceptor/ChannelInterceptorTests.java index 96810e6c45..d9d79b73a8 100644 --- a/org.springframework.integration/src/test/java/org/springframework/integration/channel/interceptor/ChannelInterceptorTests.java +++ b/org.springframework.integration/src/test/java/org/springframework/integration/channel/interceptor/ChannelInterceptorTests.java @@ -27,9 +27,9 @@ import java.util.concurrent.atomic.AtomicInteger; import org.junit.Test; -import org.springframework.integration.channel.MessageChannel; import org.springframework.integration.channel.QueueChannel; import org.springframework.integration.core.Message; +import org.springframework.integration.core.MessageChannel; import org.springframework.integration.message.MessageBuilder; import org.springframework.integration.message.StringMessage; diff --git a/org.springframework.integration/src/test/java/org/springframework/integration/config/AggregatorParserTests.java b/org.springframework.integration/src/test/java/org/springframework/integration/config/AggregatorParserTests.java index 5dcd1709bb..fa012f1548 100644 --- a/org.springframework.integration/src/test/java/org/springframework/integration/config/AggregatorParserTests.java +++ b/org.springframework.integration/src/test/java/org/springframework/integration/config/AggregatorParserTests.java @@ -31,9 +31,9 @@ import org.springframework.context.support.ClassPathXmlApplicationContext; import org.springframework.integration.aggregator.CompletionStrategy; import org.springframework.integration.aggregator.CompletionStrategyAdapter; import org.springframework.integration.aggregator.MethodInvokingAggregator; -import org.springframework.integration.channel.MessageChannel; import org.springframework.integration.channel.PollableChannel; import org.springframework.integration.core.Message; +import org.springframework.integration.core.MessageChannel; import org.springframework.integration.endpoint.SubscribingConsumerEndpoint; import org.springframework.integration.message.MessageBuilder; import org.springframework.integration.util.MethodInvoker; diff --git a/org.springframework.integration/src/test/java/org/springframework/integration/config/ChannelAdapterParserTests.java b/org.springframework.integration/src/test/java/org/springframework/integration/config/ChannelAdapterParserTests.java index f16074b57f..5f6011123e 100644 --- a/org.springframework.integration/src/test/java/org/springframework/integration/config/ChannelAdapterParserTests.java +++ b/org.springframework.integration/src/test/java/org/springframework/integration/config/ChannelAdapterParserTests.java @@ -27,10 +27,10 @@ import org.springframework.integration.bus.MessageBus; import org.springframework.integration.channel.BeanFactoryChannelResolver; import org.springframework.integration.channel.ChannelResolutionException; import org.springframework.integration.channel.DirectChannel; -import org.springframework.integration.channel.MessageChannel; import org.springframework.integration.channel.PollableChannel; import org.springframework.integration.config.xml.MessageBusParser; import org.springframework.integration.core.Message; +import org.springframework.integration.core.MessageChannel; import org.springframework.integration.endpoint.SourcePollingChannelAdapter; import org.springframework.integration.endpoint.SubscribingConsumerEndpoint; import org.springframework.integration.message.StringMessage; diff --git a/org.springframework.integration/src/test/java/org/springframework/integration/config/EndpointParserTests.java b/org.springframework.integration/src/test/java/org/springframework/integration/config/EndpointParserTests.java index a4846d2054..6866119409 100644 --- a/org.springframework.integration/src/test/java/org/springframework/integration/config/EndpointParserTests.java +++ b/org.springframework.integration/src/test/java/org/springframework/integration/config/EndpointParserTests.java @@ -25,9 +25,9 @@ import java.util.concurrent.TimeUnit; import org.junit.Test; import org.springframework.context.support.ClassPathXmlApplicationContext; -import org.springframework.integration.channel.MessageChannel; import org.springframework.integration.channel.QueueChannel; import org.springframework.integration.core.Message; +import org.springframework.integration.core.MessageChannel; import org.springframework.integration.message.GenericMessage; import org.springframework.integration.message.MessageBuilder; import org.springframework.integration.message.MessageRejectedException; diff --git a/org.springframework.integration/src/test/java/org/springframework/integration/config/FilterParserTests.java b/org.springframework.integration/src/test/java/org/springframework/integration/config/FilterParserTests.java index 4af6ee7b6b..bbad2f7d09 100644 --- a/org.springframework.integration/src/test/java/org/springframework/integration/config/FilterParserTests.java +++ b/org.springframework.integration/src/test/java/org/springframework/integration/config/FilterParserTests.java @@ -25,9 +25,9 @@ import org.junit.runner.RunWith; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.beans.factory.annotation.Qualifier; -import org.springframework.integration.channel.MessageChannel; import org.springframework.integration.channel.PollableChannel; import org.springframework.integration.core.Message; +import org.springframework.integration.core.MessageChannel; import org.springframework.integration.message.StringMessage; import org.springframework.integration.selector.MessageSelector; import org.springframework.test.context.ContextConfiguration; diff --git a/org.springframework.integration/src/test/java/org/springframework/integration/config/MessageBusParserTests.java b/org.springframework.integration/src/test/java/org/springframework/integration/config/MessageBusParserTests.java index c61451bc6e..f1a719dc79 100644 --- a/org.springframework.integration/src/test/java/org/springframework/integration/config/MessageBusParserTests.java +++ b/org.springframework.integration/src/test/java/org/springframework/integration/config/MessageBusParserTests.java @@ -36,8 +36,8 @@ import org.springframework.integration.bus.MessageBusInterceptorTests; import org.springframework.integration.bus.TestMessageBusAwareImpl; import org.springframework.integration.bus.TestMessageBusStartInterceptor; import org.springframework.integration.bus.TestMessageBusStopInterceptor; -import org.springframework.integration.channel.MessageChannel; import org.springframework.integration.config.xml.MessageBusParser; +import org.springframework.integration.core.MessageChannel; import org.springframework.integration.scheduling.TaskScheduler; import org.springframework.scheduling.concurrent.ThreadPoolTaskExecutor; diff --git a/org.springframework.integration/src/test/java/org/springframework/integration/config/PollerAnnotationConsumerAdviceChainTests.java b/org.springframework.integration/src/test/java/org/springframework/integration/config/PollerAnnotationConsumerAdviceChainTests.java index a532c1822e..07bb64d11c 100644 --- a/org.springframework.integration/src/test/java/org/springframework/integration/config/PollerAnnotationConsumerAdviceChainTests.java +++ b/org.springframework.integration/src/test/java/org/springframework/integration/config/PollerAnnotationConsumerAdviceChainTests.java @@ -26,9 +26,9 @@ import org.junit.runner.RunWith; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.beans.factory.annotation.Qualifier; -import org.springframework.integration.channel.MessageChannel; import org.springframework.integration.channel.PollableChannel; import org.springframework.integration.core.Message; +import org.springframework.integration.core.MessageChannel; import org.springframework.integration.message.StringMessage; import org.springframework.test.context.ContextConfiguration; import org.springframework.test.context.junit4.SpringJUnit4ClassRunner; diff --git a/org.springframework.integration/src/test/java/org/springframework/integration/config/PollerAnnotationConsumerTransactionalTests.java b/org.springframework.integration/src/test/java/org/springframework/integration/config/PollerAnnotationConsumerTransactionalTests.java index e3ca29537a..0d3be2c1b3 100644 --- a/org.springframework.integration/src/test/java/org/springframework/integration/config/PollerAnnotationConsumerTransactionalTests.java +++ b/org.springframework.integration/src/test/java/org/springframework/integration/config/PollerAnnotationConsumerTransactionalTests.java @@ -25,9 +25,9 @@ import org.junit.runner.RunWith; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.beans.factory.annotation.Qualifier; -import org.springframework.integration.channel.MessageChannel; import org.springframework.integration.channel.PollableChannel; import org.springframework.integration.core.Message; +import org.springframework.integration.core.MessageChannel; import org.springframework.integration.message.StringMessage; import org.springframework.integration.util.TestTransactionManager; import org.springframework.test.context.ContextConfiguration; diff --git a/org.springframework.integration/src/test/java/org/springframework/integration/config/ResequencerParserTests.java b/org.springframework.integration/src/test/java/org/springframework/integration/config/ResequencerParserTests.java index 373c5d47ce..8c39315fcc 100644 --- a/org.springframework.integration/src/test/java/org/springframework/integration/config/ResequencerParserTests.java +++ b/org.springframework.integration/src/test/java/org/springframework/integration/config/ResequencerParserTests.java @@ -31,9 +31,9 @@ import org.springframework.beans.DirectFieldAccessor; import org.springframework.context.ApplicationContext; import org.springframework.context.support.ClassPathXmlApplicationContext; import org.springframework.integration.aggregator.Resequencer; -import org.springframework.integration.channel.MessageChannel; import org.springframework.integration.channel.PollableChannel; import org.springframework.integration.core.Message; +import org.springframework.integration.core.MessageChannel; import org.springframework.integration.endpoint.SubscribingConsumerEndpoint; import org.springframework.integration.message.MessageBuilder; diff --git a/org.springframework.integration/src/test/java/org/springframework/integration/config/ServiceActivatorAnnotationPostProcessorTests.java b/org.springframework.integration/src/test/java/org/springframework/integration/config/ServiceActivatorAnnotationPostProcessorTests.java index d1cdc0d413..f92c57ff3f 100644 --- a/org.springframework.integration/src/test/java/org/springframework/integration/config/ServiceActivatorAnnotationPostProcessorTests.java +++ b/org.springframework.integration/src/test/java/org/springframework/integration/config/ServiceActivatorAnnotationPostProcessorTests.java @@ -29,10 +29,10 @@ import org.springframework.context.support.GenericApplicationContext; import org.springframework.integration.annotation.MessageEndpoint; import org.springframework.integration.annotation.ServiceActivator; import org.springframework.integration.bus.DefaultMessageBus; -import org.springframework.integration.channel.MessageChannel; import org.springframework.integration.channel.QueueChannel; import org.springframework.integration.config.annotation.MessagingAnnotationPostProcessor; import org.springframework.integration.config.xml.MessageBusParser; +import org.springframework.integration.core.MessageChannel; import org.springframework.integration.message.StringMessage; import org.springframework.integration.util.TestUtils; diff --git a/org.springframework.integration/src/test/java/org/springframework/integration/config/TestChannelInterceptor.java b/org.springframework.integration/src/test/java/org/springframework/integration/config/TestChannelInterceptor.java index cd0e3c2ad1..8e54924419 100644 --- a/org.springframework.integration/src/test/java/org/springframework/integration/config/TestChannelInterceptor.java +++ b/org.springframework.integration/src/test/java/org/springframework/integration/config/TestChannelInterceptor.java @@ -18,9 +18,9 @@ package org.springframework.integration.config; import java.util.concurrent.atomic.AtomicInteger; -import org.springframework.integration.channel.MessageChannel; import org.springframework.integration.channel.interceptor.ChannelInterceptorAdapter; import org.springframework.integration.core.Message; +import org.springframework.integration.core.MessageChannel; /** * @author Mark Fisher diff --git a/org.springframework.integration/src/test/java/org/springframework/integration/config/WireTapParserTests.java b/org.springframework.integration/src/test/java/org/springframework/integration/config/WireTapParserTests.java index 0e2285be9e..49855690e0 100644 --- a/org.springframework.integration/src/test/java/org/springframework/integration/config/WireTapParserTests.java +++ b/org.springframework.integration/src/test/java/org/springframework/integration/config/WireTapParserTests.java @@ -26,10 +26,10 @@ import org.junit.Test; import org.springframework.beans.DirectFieldAccessor; import org.springframework.context.support.ClassPathXmlApplicationContext; -import org.springframework.integration.channel.MessageChannel; import org.springframework.integration.channel.PollableChannel; import org.springframework.integration.channel.interceptor.WireTap; import org.springframework.integration.core.Message; +import org.springframework.integration.core.MessageChannel; import org.springframework.integration.message.StringMessage; /** diff --git a/org.springframework.integration/src/test/java/org/springframework/integration/config/annotation/AnnotatedEndpointActivationTests.java b/org.springframework.integration/src/test/java/org/springframework/integration/config/annotation/AnnotatedEndpointActivationTests.java index 78d37afb46..d74c185841 100644 --- a/org.springframework.integration/src/test/java/org/springframework/integration/config/annotation/AnnotatedEndpointActivationTests.java +++ b/org.springframework.integration/src/test/java/org/springframework/integration/config/annotation/AnnotatedEndpointActivationTests.java @@ -29,9 +29,9 @@ import org.springframework.beans.factory.annotation.Qualifier; import org.springframework.integration.annotation.MessageEndpoint; import org.springframework.integration.annotation.ServiceActivator; import org.springframework.integration.bus.MessageBus; -import org.springframework.integration.channel.MessageChannel; import org.springframework.integration.channel.PollableChannel; import org.springframework.integration.core.Message; +import org.springframework.integration.core.MessageChannel; import org.springframework.integration.message.GenericMessage; import org.springframework.integration.message.MessageDeliveryException; import org.springframework.test.context.ContextConfiguration; diff --git a/org.springframework.integration/src/test/java/org/springframework/integration/config/annotation/MessagingAnnotationPostProcessorTests.java b/org.springframework.integration/src/test/java/org/springframework/integration/config/annotation/MessagingAnnotationPostProcessorTests.java index 89e2b95dbd..a89381b742 100644 --- a/org.springframework.integration/src/test/java/org/springframework/integration/config/annotation/MessagingAnnotationPostProcessorTests.java +++ b/org.springframework.integration/src/test/java/org/springframework/integration/config/annotation/MessagingAnnotationPostProcessorTests.java @@ -41,11 +41,11 @@ import org.springframework.integration.bus.DefaultMessageBus; import org.springframework.integration.channel.BeanFactoryChannelResolver; import org.springframework.integration.channel.ChannelResolver; import org.springframework.integration.channel.DirectChannel; -import org.springframework.integration.channel.MessageChannel; import org.springframework.integration.channel.PollableChannel; import org.springframework.integration.channel.QueueChannel; import org.springframework.integration.config.xml.MessageBusParser; import org.springframework.integration.core.Message; +import org.springframework.integration.core.MessageChannel; import org.springframework.integration.endpoint.PollingConsumerEndpoint; import org.springframework.integration.message.MessageBuilder; import org.springframework.integration.message.MessageConsumer; diff --git a/org.springframework.integration/src/test/java/org/springframework/integration/config/xml/GatewayParserTests.java b/org.springframework.integration/src/test/java/org/springframework/integration/config/xml/GatewayParserTests.java index 3c19b0bf53..38fb3c2ff8 100644 --- a/org.springframework.integration/src/test/java/org/springframework/integration/config/xml/GatewayParserTests.java +++ b/org.springframework.integration/src/test/java/org/springframework/integration/config/xml/GatewayParserTests.java @@ -24,9 +24,9 @@ import org.junit.Test; import org.springframework.context.ApplicationContext; import org.springframework.context.support.ClassPathXmlApplicationContext; -import org.springframework.integration.channel.MessageChannel; import org.springframework.integration.channel.PollableChannel; import org.springframework.integration.core.Message; +import org.springframework.integration.core.MessageChannel; import org.springframework.integration.gateway.TestService; import org.springframework.integration.message.MessageBuilder; import org.springframework.integration.message.StringMessage; diff --git a/org.springframework.integration/src/test/java/org/springframework/integration/dispatcher/PollingTransactionTests.java b/org.springframework.integration/src/test/java/org/springframework/integration/dispatcher/PollingTransactionTests.java index 1e3000b282..613ab78dd2 100644 --- a/org.springframework.integration/src/test/java/org/springframework/integration/dispatcher/PollingTransactionTests.java +++ b/org.springframework.integration/src/test/java/org/springframework/integration/dispatcher/PollingTransactionTests.java @@ -23,9 +23,9 @@ import static org.junit.Assert.assertNull; import org.junit.Test; import org.springframework.context.support.ClassPathXmlApplicationContext; -import org.springframework.integration.channel.MessageChannel; import org.springframework.integration.channel.PollableChannel; import org.springframework.integration.core.Message; +import org.springframework.integration.core.MessageChannel; import org.springframework.integration.message.StringMessage; import org.springframework.integration.util.TestTransactionManager; import org.springframework.transaction.IllegalTransactionStateException; diff --git a/org.springframework.integration/src/test/java/org/springframework/integration/endpoint/ReturnAddressTests.java b/org.springframework.integration/src/test/java/org/springframework/integration/endpoint/ReturnAddressTests.java index 3e2a5a8061..52536f4167 100644 --- a/org.springframework.integration/src/test/java/org/springframework/integration/endpoint/ReturnAddressTests.java +++ b/org.springframework.integration/src/test/java/org/springframework/integration/endpoint/ReturnAddressTests.java @@ -23,9 +23,9 @@ import static org.junit.Assert.assertNull; import org.junit.Test; import org.springframework.context.support.ClassPathXmlApplicationContext; -import org.springframework.integration.channel.MessageChannel; import org.springframework.integration.channel.PollableChannel; import org.springframework.integration.core.Message; +import org.springframework.integration.core.MessageChannel; import org.springframework.integration.message.MessageBuilder; import org.springframework.integration.message.StringMessage; diff --git a/org.springframework.integration/src/test/java/org/springframework/integration/filter/FilterContextTests.java b/org.springframework.integration/src/test/java/org/springframework/integration/filter/FilterContextTests.java index cae519abd7..b780c22345 100644 --- a/org.springframework.integration/src/test/java/org/springframework/integration/filter/FilterContextTests.java +++ b/org.springframework.integration/src/test/java/org/springframework/integration/filter/FilterContextTests.java @@ -23,9 +23,9 @@ import org.junit.Test; import org.springframework.context.ApplicationContext; import org.springframework.context.support.ClassPathXmlApplicationContext; -import org.springframework.integration.channel.MessageChannel; import org.springframework.integration.channel.PollableChannel; import org.springframework.integration.core.Message; +import org.springframework.integration.core.MessageChannel; import org.springframework.integration.message.StringMessage; /** diff --git a/org.springframework.integration/src/test/java/org/springframework/integration/gateway/GatewayProxyFactoryBeanTests.java b/org.springframework.integration/src/test/java/org/springframework/integration/gateway/GatewayProxyFactoryBeanTests.java index 13a92c7e81..32777b69d1 100644 --- a/org.springframework.integration/src/test/java/org/springframework/integration/gateway/GatewayProxyFactoryBeanTests.java +++ b/org.springframework.integration/src/test/java/org/springframework/integration/gateway/GatewayProxyFactoryBeanTests.java @@ -29,10 +29,10 @@ import org.junit.Test; import org.springframework.context.support.ClassPathXmlApplicationContext; import org.springframework.integration.channel.DirectChannel; -import org.springframework.integration.channel.MessageChannel; import org.springframework.integration.channel.PollableChannel; import org.springframework.integration.channel.QueueChannel; import org.springframework.integration.core.Message; +import org.springframework.integration.core.MessageChannel; import org.springframework.integration.message.StringMessage; /** diff --git a/org.springframework.integration/src/test/java/org/springframework/integration/gateway/SimpleMessagingGatewayTests.java b/org.springframework.integration/src/test/java/org/springframework/integration/gateway/SimpleMessagingGatewayTests.java index c502b3187b..82afb75e03 100644 --- a/org.springframework.integration/src/test/java/org/springframework/integration/gateway/SimpleMessagingGatewayTests.java +++ b/org.springframework.integration/src/test/java/org/springframework/integration/gateway/SimpleMessagingGatewayTests.java @@ -32,9 +32,9 @@ import org.junit.Ignore; import org.junit.Test; import org.springframework.integration.bus.MessageBus; -import org.springframework.integration.channel.MessageChannel; import org.springframework.integration.channel.PollableChannel; import org.springframework.integration.core.Message; +import org.springframework.integration.core.MessageChannel; import org.springframework.integration.core.MessageHeaders; import org.springframework.integration.message.MessageDeliveryException; diff --git a/org.springframework.integration/src/test/java/org/springframework/integration/gateway/TestChannelInterceptor.java b/org.springframework.integration/src/test/java/org/springframework/integration/gateway/TestChannelInterceptor.java index d8bba23ab9..86cbfbfe6e 100644 --- a/org.springframework.integration/src/test/java/org/springframework/integration/gateway/TestChannelInterceptor.java +++ b/org.springframework.integration/src/test/java/org/springframework/integration/gateway/TestChannelInterceptor.java @@ -18,9 +18,9 @@ package org.springframework.integration.gateway; import java.util.concurrent.atomic.AtomicInteger; -import org.springframework.integration.channel.MessageChannel; import org.springframework.integration.channel.interceptor.ChannelInterceptorAdapter; import org.springframework.integration.core.Message; +import org.springframework.integration.core.MessageChannel; /** * @author Mark Fisher diff --git a/org.springframework.integration/src/test/java/org/springframework/integration/router/ErrorMessageExceptionTypeRouterTests.java b/org.springframework.integration/src/test/java/org/springframework/integration/router/ErrorMessageExceptionTypeRouterTests.java index cf79c8d6a9..ab9c5b9191 100644 --- a/org.springframework.integration/src/test/java/org/springframework/integration/router/ErrorMessageExceptionTypeRouterTests.java +++ b/org.springframework.integration/src/test/java/org/springframework/integration/router/ErrorMessageExceptionTypeRouterTests.java @@ -24,9 +24,9 @@ import java.util.Map; import org.junit.Test; -import org.springframework.integration.channel.MessageChannel; import org.springframework.integration.channel.QueueChannel; import org.springframework.integration.core.Message; +import org.springframework.integration.core.MessageChannel; import org.springframework.integration.message.ErrorMessage; import org.springframework.integration.message.GenericMessage; import org.springframework.integration.message.MessageDeliveryException; diff --git a/org.springframework.integration/src/test/java/org/springframework/integration/router/MethodInvokingRouterTests.java b/org.springframework.integration/src/test/java/org/springframework/integration/router/MethodInvokingRouterTests.java index a0187aeb86..9c470f7cf6 100644 --- a/org.springframework.integration/src/test/java/org/springframework/integration/router/MethodInvokingRouterTests.java +++ b/org.springframework.integration/src/test/java/org/springframework/integration/router/MethodInvokingRouterTests.java @@ -29,9 +29,9 @@ import org.junit.Test; import org.springframework.integration.annotation.Header; import org.springframework.integration.channel.ChannelResolver; import org.springframework.integration.channel.TestChannelResolver; -import org.springframework.integration.channel.MessageChannel; import org.springframework.integration.channel.QueueChannel; import org.springframework.integration.core.Message; +import org.springframework.integration.core.MessageChannel; import org.springframework.integration.message.GenericMessage; import org.springframework.integration.message.MessageBuilder; import org.springframework.integration.message.MessagingException; diff --git a/org.springframework.integration/src/test/java/org/springframework/integration/router/PayloadTypeRouterTests.java b/org.springframework.integration/src/test/java/org/springframework/integration/router/PayloadTypeRouterTests.java index 6e1c3cad9c..c212fac152 100644 --- a/org.springframework.integration/src/test/java/org/springframework/integration/router/PayloadTypeRouterTests.java +++ b/org.springframework.integration/src/test/java/org/springframework/integration/router/PayloadTypeRouterTests.java @@ -24,9 +24,9 @@ import java.util.concurrent.ConcurrentHashMap; import org.junit.Test; -import org.springframework.integration.channel.MessageChannel; import org.springframework.integration.channel.QueueChannel; import org.springframework.integration.core.Message; +import org.springframework.integration.core.MessageChannel; import org.springframework.integration.message.GenericMessage; import org.springframework.integration.message.StringMessage; diff --git a/org.springframework.integration/src/test/java/org/springframework/integration/router/RecipientListRouterTests.java b/org.springframework.integration/src/test/java/org/springframework/integration/router/RecipientListRouterTests.java index 8d561f9b1f..2aa574bf24 100644 --- a/org.springframework.integration/src/test/java/org/springframework/integration/router/RecipientListRouterTests.java +++ b/org.springframework.integration/src/test/java/org/springframework/integration/router/RecipientListRouterTests.java @@ -28,9 +28,9 @@ import java.util.List; import org.junit.Test; -import org.springframework.integration.channel.MessageChannel; import org.springframework.integration.channel.QueueChannel; import org.springframework.integration.core.Message; +import org.springframework.integration.core.MessageChannel; import org.springframework.integration.message.StringMessage; /** diff --git a/org.springframework.integration/src/test/java/org/springframework/integration/router/RouterTests.java b/org.springframework.integration/src/test/java/org/springframework/integration/router/RouterTests.java index e69e94ac13..b799d784e3 100644 --- a/org.springframework.integration/src/test/java/org/springframework/integration/router/RouterTests.java +++ b/org.springframework.integration/src/test/java/org/springframework/integration/router/RouterTests.java @@ -24,10 +24,10 @@ import java.util.List; import org.junit.Test; import org.springframework.context.support.GenericApplicationContext; -import org.springframework.integration.channel.MessageChannel; import org.springframework.integration.channel.QueueChannel; import org.springframework.integration.channel.TestChannelResolver; import org.springframework.integration.core.Message; +import org.springframework.integration.core.MessageChannel; import org.springframework.integration.message.MessageDeliveryException; import org.springframework.integration.message.MessagingException; import org.springframework.integration.message.StringMessage; diff --git a/org.springframework.integration/src/test/java/org/springframework/integration/router/SingleChannelRouterTests.java b/org.springframework.integration/src/test/java/org/springframework/integration/router/SingleChannelRouterTests.java index 09f24b53f2..647cc43813 100644 --- a/org.springframework.integration/src/test/java/org/springframework/integration/router/SingleChannelRouterTests.java +++ b/org.springframework.integration/src/test/java/org/springframework/integration/router/SingleChannelRouterTests.java @@ -21,10 +21,10 @@ import static org.junit.Assert.assertNotNull; import org.junit.Test; -import org.springframework.integration.channel.MessageChannel; import org.springframework.integration.channel.QueueChannel; import org.springframework.integration.channel.TestChannelResolver; import org.springframework.integration.core.Message; +import org.springframework.integration.core.MessageChannel; import org.springframework.integration.message.MessagingException; import org.springframework.integration.message.StringMessage; diff --git a/org.springframework.integration/src/test/java/org/springframework/integration/router/config/RouterParserTests.java b/org.springframework.integration/src/test/java/org/springframework/integration/router/config/RouterParserTests.java index 6f7e2541f7..846fb0b006 100644 --- a/org.springframework.integration/src/test/java/org/springframework/integration/router/config/RouterParserTests.java +++ b/org.springframework.integration/src/test/java/org/springframework/integration/router/config/RouterParserTests.java @@ -22,9 +22,9 @@ import static org.junit.Assert.assertNull; import org.junit.Test; import org.springframework.context.support.ClassPathXmlApplicationContext; -import org.springframework.integration.channel.MessageChannel; import org.springframework.integration.channel.PollableChannel; import org.springframework.integration.core.Message; +import org.springframework.integration.core.MessageChannel; import org.springframework.integration.message.StringMessage; /** diff --git a/org.springframework.integration/src/test/java/org/springframework/integration/router/config/SplitterAggregatorTests.java b/org.springframework.integration/src/test/java/org/springframework/integration/router/config/SplitterAggregatorTests.java index 5a028c6bc0..a2fc93dc3c 100644 --- a/org.springframework.integration/src/test/java/org/springframework/integration/router/config/SplitterAggregatorTests.java +++ b/org.springframework.integration/src/test/java/org/springframework/integration/router/config/SplitterAggregatorTests.java @@ -27,9 +27,9 @@ import org.junit.Test; import org.springframework.context.ApplicationContext; import org.springframework.context.support.ClassPathXmlApplicationContext; -import org.springframework.integration.channel.MessageChannel; import org.springframework.integration.channel.PollableChannel; import org.springframework.integration.core.Message; +import org.springframework.integration.core.MessageChannel; import org.springframework.integration.message.GenericMessage; /** diff --git a/org.springframework.integration/src/test/java/org/springframework/integration/router/config/SplitterParserTests.java b/org.springframework.integration/src/test/java/org/springframework/integration/router/config/SplitterParserTests.java index 4cfcf2cfd7..75583ff4b6 100644 --- a/org.springframework.integration/src/test/java/org/springframework/integration/router/config/SplitterParserTests.java +++ b/org.springframework.integration/src/test/java/org/springframework/integration/router/config/SplitterParserTests.java @@ -22,9 +22,9 @@ import static org.junit.Assert.assertNull; import org.junit.Test; import org.springframework.context.support.ClassPathXmlApplicationContext; -import org.springframework.integration.channel.MessageChannel; import org.springframework.integration.channel.PollableChannel; import org.springframework.integration.core.Message; +import org.springframework.integration.core.MessageChannel; import org.springframework.integration.message.StringMessage; /** diff --git a/org.springframework.integration/src/test/java/org/springframework/integration/splitter/SplitterIntegrationTests.java b/org.springframework.integration/src/test/java/org/springframework/integration/splitter/SplitterIntegrationTests.java index 33686f36b8..31969c97e7 100644 --- a/org.springframework.integration/src/test/java/org/springframework/integration/splitter/SplitterIntegrationTests.java +++ b/org.springframework.integration/src/test/java/org/springframework/integration/splitter/SplitterIntegrationTests.java @@ -30,7 +30,7 @@ import org.springframework.beans.factory.annotation.Qualifier; import org.springframework.integration.annotation.MessageEndpoint; import org.springframework.integration.annotation.ServiceActivator; import org.springframework.integration.annotation.Splitter; -import org.springframework.integration.channel.MessageChannel; +import org.springframework.integration.core.MessageChannel; import org.springframework.integration.message.GenericMessage; import org.springframework.test.context.ContextConfiguration; import org.springframework.test.context.junit4.SpringJUnit4ClassRunner; diff --git a/org.springframework.integration/src/test/java/org/springframework/integration/transformer/TransformerContextTests.java b/org.springframework.integration/src/test/java/org/springframework/integration/transformer/TransformerContextTests.java index 7a66b94350..3f21943885 100644 --- a/org.springframework.integration/src/test/java/org/springframework/integration/transformer/TransformerContextTests.java +++ b/org.springframework.integration/src/test/java/org/springframework/integration/transformer/TransformerContextTests.java @@ -22,9 +22,9 @@ import org.junit.Test; import org.springframework.context.ApplicationContext; import org.springframework.context.support.ClassPathXmlApplicationContext; -import org.springframework.integration.channel.MessageChannel; import org.springframework.integration.channel.PollableChannel; import org.springframework.integration.core.Message; +import org.springframework.integration.core.MessageChannel; import org.springframework.integration.message.StringMessage; /**