From b3b4f58ec8044a62314f0f47593d8f27bae17c8a Mon Sep 17 00:00:00 2001 From: Mark Fisher Date: Wed, 28 Jul 2010 14:45:03 +0000 Subject: [PATCH] INT-1129 moved MessageSelector from 'selector' to 'core' --- .../org/springframework/integration/channel/ChannelPurger.java | 2 +- .../org/springframework/integration/channel/QueueChannel.java | 2 +- .../channel/interceptor/MessageSelectingInterceptor.java | 2 +- .../integration/channel/interceptor/WireTap.java | 2 +- .../springframework/integration/config/FilterFactoryBean.java | 2 +- .../integration/{selector => core}/MessageSelector.java | 3 +-- .../springframework/integration/core/MessagingTemplate.java | 1 - .../integration/filter/AbstractMessageProcessingSelector.java | 2 +- .../integration/filter/ExpressionEvaluatingSelector.java | 2 +- .../org/springframework/integration/filter/MessageFilter.java | 2 +- .../integration/filter/MethodInvokingSelector.java | 2 +- .../integration/router/RecipientListRouter.java | 2 +- .../integration/selector/MessageSelectorChain.java | 1 + .../integration/selector/PayloadTypeSelector.java | 1 + .../integration/selector/UnexpiredMessageSelector.java | 1 + .../integration/channel/ChannelPurgerTests.java | 2 +- .../channel/interceptor/MessageSelectingInterceptorTests.java | 2 +- .../integration/channel/interceptor/WireTapTests.java | 2 +- .../springframework/integration/config/FilterParserTests.java | 2 +- .../integration/config/SelectorChainParserTests.java | 2 +- .../integration/config/StubMessageSelector.java | 2 +- .../org/springframework/integration/config/TestSelector.java | 2 +- .../integration/config/TopLevelSelectorParserTests.java | 2 +- .../config/xml/MethodInvokingSelectorParserTests.java | 2 +- .../springframework/integration/filter/MessageFilterTests.java | 2 +- .../integration/router/RecipientListRouterTests.java | 2 +- .../integration/selector/MessageSelectorChainTests.java | 1 + .../security/config/SecuredChannelsParserTests.java | 2 +- .../integration/xml/selector/AbstractXPathMessageSelector.java | 2 +- .../xml/selector/BooleanTestXPathMessageSelector.java | 2 +- .../xml/selector/StringValueTestXPathMessageSelector.java | 2 +- .../integration/xml/config/XPathSelectorParserTests.java | 2 +- 32 files changed, 31 insertions(+), 29 deletions(-) rename spring-integration-core/src/main/java/org/springframework/integration/{selector => core}/MessageSelector.java (88%) diff --git a/spring-integration-core/src/main/java/org/springframework/integration/channel/ChannelPurger.java b/spring-integration-core/src/main/java/org/springframework/integration/channel/ChannelPurger.java index b6e661c020..8ffa5e65ef 100644 --- a/spring-integration-core/src/main/java/org/springframework/integration/channel/ChannelPurger.java +++ b/spring-integration-core/src/main/java/org/springframework/integration/channel/ChannelPurger.java @@ -20,7 +20,7 @@ import java.util.ArrayList; import java.util.List; import org.springframework.integration.core.Message; -import org.springframework.integration.selector.MessageSelector; +import org.springframework.integration.core.MessageSelector; import org.springframework.util.Assert; /** diff --git a/spring-integration-core/src/main/java/org/springframework/integration/channel/QueueChannel.java b/spring-integration-core/src/main/java/org/springframework/integration/channel/QueueChannel.java index 2b70e00284..37a8ed9e97 100644 --- a/spring-integration-core/src/main/java/org/springframework/integration/channel/QueueChannel.java +++ b/spring-integration-core/src/main/java/org/springframework/integration/channel/QueueChannel.java @@ -23,7 +23,7 @@ import java.util.concurrent.LinkedBlockingQueue; import java.util.concurrent.TimeUnit; import org.springframework.integration.core.Message; -import org.springframework.integration.selector.MessageSelector; +import org.springframework.integration.core.MessageSelector; import org.springframework.util.Assert; /** diff --git a/spring-integration-core/src/main/java/org/springframework/integration/channel/interceptor/MessageSelectingInterceptor.java b/spring-integration-core/src/main/java/org/springframework/integration/channel/interceptor/MessageSelectingInterceptor.java index fde45d4bdd..e84368561f 100644 --- a/spring-integration-core/src/main/java/org/springframework/integration/channel/interceptor/MessageSelectingInterceptor.java +++ b/spring-integration-core/src/main/java/org/springframework/integration/channel/interceptor/MessageSelectingInterceptor.java @@ -22,7 +22,7 @@ import java.util.List; import org.springframework.integration.core.Message; import org.springframework.integration.core.MessageChannel; import org.springframework.integration.core.MessageDeliveryException; -import org.springframework.integration.selector.MessageSelector; +import org.springframework.integration.core.MessageSelector; /** * A {@link org.springframework.integration.channel.ChannelInterceptor} that diff --git a/spring-integration-core/src/main/java/org/springframework/integration/channel/interceptor/WireTap.java b/spring-integration-core/src/main/java/org/springframework/integration/channel/interceptor/WireTap.java index 52ea8c8dc1..36083742d3 100644 --- a/spring-integration-core/src/main/java/org/springframework/integration/channel/interceptor/WireTap.java +++ b/spring-integration-core/src/main/java/org/springframework/integration/channel/interceptor/WireTap.java @@ -23,7 +23,7 @@ import org.springframework.context.Lifecycle; import org.springframework.integration.channel.ChannelInterceptor; import org.springframework.integration.core.Message; import org.springframework.integration.core.MessageChannel; -import org.springframework.integration.selector.MessageSelector; +import org.springframework.integration.core.MessageSelector; import org.springframework.util.Assert; /** diff --git a/spring-integration-core/src/main/java/org/springframework/integration/config/FilterFactoryBean.java b/spring-integration-core/src/main/java/org/springframework/integration/config/FilterFactoryBean.java index e20239f7c8..9cf2aa2d18 100644 --- a/spring-integration-core/src/main/java/org/springframework/integration/config/FilterFactoryBean.java +++ b/spring-integration-core/src/main/java/org/springframework/integration/config/FilterFactoryBean.java @@ -17,11 +17,11 @@ package org.springframework.integration.config; import org.springframework.integration.core.MessageChannel; +import org.springframework.integration.core.MessageSelector; import org.springframework.integration.filter.ExpressionEvaluatingSelector; import org.springframework.integration.filter.MessageFilter; import org.springframework.integration.filter.MethodInvokingSelector; import org.springframework.integration.message.MessageHandler; -import org.springframework.integration.selector.MessageSelector; import org.springframework.util.StringUtils; /** diff --git a/spring-integration-core/src/main/java/org/springframework/integration/selector/MessageSelector.java b/spring-integration-core/src/main/java/org/springframework/integration/core/MessageSelector.java similarity index 88% rename from spring-integration-core/src/main/java/org/springframework/integration/selector/MessageSelector.java rename to spring-integration-core/src/main/java/org/springframework/integration/core/MessageSelector.java index 12ccc3ff21..01e8e74cfc 100644 --- a/spring-integration-core/src/main/java/org/springframework/integration/selector/MessageSelector.java +++ b/spring-integration-core/src/main/java/org/springframework/integration/core/MessageSelector.java @@ -14,9 +14,8 @@ * limitations under the License. */ -package org.springframework.integration.selector; +package org.springframework.integration.core; -import org.springframework.integration.core.Message; /** * Strategy interface for message selection. diff --git a/spring-integration-core/src/main/java/org/springframework/integration/core/MessagingTemplate.java b/spring-integration-core/src/main/java/org/springframework/integration/core/MessagingTemplate.java index 9913f2aea5..6be2630b0b 100644 --- a/spring-integration-core/src/main/java/org/springframework/integration/core/MessagingTemplate.java +++ b/spring-integration-core/src/main/java/org/springframework/integration/core/MessagingTemplate.java @@ -25,7 +25,6 @@ import org.apache.commons.logging.LogFactory; import org.springframework.beans.factory.InitializingBean; import org.springframework.integration.channel.PollableChannel; -import org.springframework.integration.selector.MessageSelector; import org.springframework.transaction.PlatformTransactionManager; import org.springframework.transaction.TransactionStatus; import org.springframework.transaction.support.TransactionCallback; diff --git a/spring-integration-core/src/main/java/org/springframework/integration/filter/AbstractMessageProcessingSelector.java b/spring-integration-core/src/main/java/org/springframework/integration/filter/AbstractMessageProcessingSelector.java index b6b75bff17..47d53bf7cc 100644 --- a/spring-integration-core/src/main/java/org/springframework/integration/filter/AbstractMessageProcessingSelector.java +++ b/spring-integration-core/src/main/java/org/springframework/integration/filter/AbstractMessageProcessingSelector.java @@ -21,9 +21,9 @@ import org.springframework.beans.factory.BeanFactory; import org.springframework.beans.factory.BeanFactoryAware; import org.springframework.core.convert.ConversionService; import org.springframework.integration.core.Message; +import org.springframework.integration.core.MessageSelector; import org.springframework.integration.handler.AbstractMessageProcessor; import org.springframework.integration.handler.MessageProcessor; -import org.springframework.integration.selector.MessageSelector; import org.springframework.util.Assert; /** diff --git a/spring-integration-core/src/main/java/org/springframework/integration/filter/ExpressionEvaluatingSelector.java b/spring-integration-core/src/main/java/org/springframework/integration/filter/ExpressionEvaluatingSelector.java index 574d968081..6616ce4b39 100644 --- a/spring-integration-core/src/main/java/org/springframework/integration/filter/ExpressionEvaluatingSelector.java +++ b/spring-integration-core/src/main/java/org/springframework/integration/filter/ExpressionEvaluatingSelector.java @@ -16,8 +16,8 @@ package org.springframework.integration.filter; +import org.springframework.integration.core.MessageSelector; import org.springframework.integration.handler.ExpressionEvaluatingMessageProcessor; -import org.springframework.integration.selector.MessageSelector; /** * A {@link MessageSelector} implementation that evaluates a SpEL expression. diff --git a/spring-integration-core/src/main/java/org/springframework/integration/filter/MessageFilter.java b/spring-integration-core/src/main/java/org/springframework/integration/filter/MessageFilter.java index bf6e9d93b6..e3bd3d40e5 100644 --- a/spring-integration-core/src/main/java/org/springframework/integration/filter/MessageFilter.java +++ b/spring-integration-core/src/main/java/org/springframework/integration/filter/MessageFilter.java @@ -21,9 +21,9 @@ import org.springframework.integration.core.Message; import org.springframework.integration.core.MessageChannel; import org.springframework.integration.core.MessageDeliveryException; import org.springframework.integration.core.MessageHeaders; +import org.springframework.integration.core.MessageSelector; import org.springframework.integration.handler.AbstractReplyProducingMessageHandler; import org.springframework.integration.message.MessageRejectedException; -import org.springframework.integration.selector.MessageSelector; import org.springframework.util.Assert; /** diff --git a/spring-integration-core/src/main/java/org/springframework/integration/filter/MethodInvokingSelector.java b/spring-integration-core/src/main/java/org/springframework/integration/filter/MethodInvokingSelector.java index e587934dee..160a339b54 100644 --- a/spring-integration-core/src/main/java/org/springframework/integration/filter/MethodInvokingSelector.java +++ b/spring-integration-core/src/main/java/org/springframework/integration/filter/MethodInvokingSelector.java @@ -19,8 +19,8 @@ package org.springframework.integration.filter; import java.lang.reflect.Method; import org.springframework.integration.annotation.Filter; +import org.springframework.integration.core.MessageSelector; import org.springframework.integration.handler.MethodInvokingMessageProcessor; -import org.springframework.integration.selector.MessageSelector; import org.springframework.util.Assert; /** diff --git a/spring-integration-core/src/main/java/org/springframework/integration/router/RecipientListRouter.java b/spring-integration-core/src/main/java/org/springframework/integration/router/RecipientListRouter.java index a8be741e53..64e3ea2db4 100644 --- a/spring-integration-core/src/main/java/org/springframework/integration/router/RecipientListRouter.java +++ b/spring-integration-core/src/main/java/org/springframework/integration/router/RecipientListRouter.java @@ -22,7 +22,7 @@ import java.util.List; import org.springframework.beans.factory.InitializingBean; import org.springframework.integration.core.Message; import org.springframework.integration.core.MessageChannel; -import org.springframework.integration.selector.MessageSelector; +import org.springframework.integration.core.MessageSelector; import org.springframework.util.Assert; /** diff --git a/spring-integration-core/src/main/java/org/springframework/integration/selector/MessageSelectorChain.java b/spring-integration-core/src/main/java/org/springframework/integration/selector/MessageSelectorChain.java index cf40a999d5..b7c756a478 100644 --- a/spring-integration-core/src/main/java/org/springframework/integration/selector/MessageSelectorChain.java +++ b/spring-integration-core/src/main/java/org/springframework/integration/selector/MessageSelectorChain.java @@ -20,6 +20,7 @@ import java.util.List; import java.util.concurrent.CopyOnWriteArrayList; import org.springframework.integration.core.Message; +import org.springframework.integration.core.MessageSelector; import org.springframework.util.Assert; /** diff --git a/spring-integration-core/src/main/java/org/springframework/integration/selector/PayloadTypeSelector.java b/spring-integration-core/src/main/java/org/springframework/integration/selector/PayloadTypeSelector.java index 305c9e86b6..c5cc3e44c0 100644 --- a/spring-integration-core/src/main/java/org/springframework/integration/selector/PayloadTypeSelector.java +++ b/spring-integration-core/src/main/java/org/springframework/integration/selector/PayloadTypeSelector.java @@ -20,6 +20,7 @@ import java.util.ArrayList; import java.util.List; import org.springframework.integration.core.Message; +import org.springframework.integration.core.MessageSelector; import org.springframework.util.Assert; /** diff --git a/spring-integration-core/src/main/java/org/springframework/integration/selector/UnexpiredMessageSelector.java b/spring-integration-core/src/main/java/org/springframework/integration/selector/UnexpiredMessageSelector.java index fc8c5f7bd3..493468f39d 100644 --- a/spring-integration-core/src/main/java/org/springframework/integration/selector/UnexpiredMessageSelector.java +++ b/spring-integration-core/src/main/java/org/springframework/integration/selector/UnexpiredMessageSelector.java @@ -17,6 +17,7 @@ package org.springframework.integration.selector; import org.springframework.integration.core.Message; +import org.springframework.integration.core.MessageSelector; /** * A {@link MessageSelector} that accepts {@link Message Messages} that are diff --git a/spring-integration-core/src/test/java/org/springframework/integration/channel/ChannelPurgerTests.java b/spring-integration-core/src/test/java/org/springframework/integration/channel/ChannelPurgerTests.java index 84f97c63aa..5bd74f55c2 100644 --- a/spring-integration-core/src/test/java/org/springframework/integration/channel/ChannelPurgerTests.java +++ b/spring-integration-core/src/test/java/org/springframework/integration/channel/ChannelPurgerTests.java @@ -25,8 +25,8 @@ import java.util.List; import org.junit.Test; import org.springframework.integration.core.Message; +import org.springframework.integration.core.MessageSelector; import org.springframework.integration.message.StringMessage; -import org.springframework.integration.selector.MessageSelector; /** * @author Mark Fisher diff --git a/spring-integration-core/src/test/java/org/springframework/integration/channel/interceptor/MessageSelectingInterceptorTests.java b/spring-integration-core/src/test/java/org/springframework/integration/channel/interceptor/MessageSelectingInterceptorTests.java index 96b7256e91..93051cd77d 100644 --- a/spring-integration-core/src/test/java/org/springframework/integration/channel/interceptor/MessageSelectingInterceptorTests.java +++ b/spring-integration-core/src/test/java/org/springframework/integration/channel/interceptor/MessageSelectingInterceptorTests.java @@ -26,8 +26,8 @@ import org.junit.Test; import org.springframework.integration.channel.QueueChannel; import org.springframework.integration.core.Message; import org.springframework.integration.core.MessageDeliveryException; +import org.springframework.integration.core.MessageSelector; import org.springframework.integration.message.StringMessage; -import org.springframework.integration.selector.MessageSelector; /** * @author Mark Fisher diff --git a/spring-integration-core/src/test/java/org/springframework/integration/channel/interceptor/WireTapTests.java b/spring-integration-core/src/test/java/org/springframework/integration/channel/interceptor/WireTapTests.java index 7721f9ca6f..30064740ba 100644 --- a/spring-integration-core/src/test/java/org/springframework/integration/channel/interceptor/WireTapTests.java +++ b/spring-integration-core/src/test/java/org/springframework/integration/channel/interceptor/WireTapTests.java @@ -25,8 +25,8 @@ import org.junit.Test; import org.springframework.integration.channel.QueueChannel; import org.springframework.integration.core.Message; import org.springframework.integration.core.MessageBuilder; +import org.springframework.integration.core.MessageSelector; import org.springframework.integration.message.StringMessage; -import org.springframework.integration.selector.MessageSelector; /** * @author Mark Fisher diff --git a/spring-integration-core/src/test/java/org/springframework/integration/config/FilterParserTests.java b/spring-integration-core/src/test/java/org/springframework/integration/config/FilterParserTests.java index 6b301e76dd..47403b52ae 100644 --- a/spring-integration-core/src/test/java/org/springframework/integration/config/FilterParserTests.java +++ b/spring-integration-core/src/test/java/org/springframework/integration/config/FilterParserTests.java @@ -28,9 +28,9 @@ import org.springframework.beans.factory.annotation.Qualifier; import org.springframework.integration.channel.PollableChannel; import org.springframework.integration.core.Message; import org.springframework.integration.core.MessageChannel; +import org.springframework.integration.core.MessageSelector; import org.springframework.integration.message.MessageRejectedException; import org.springframework.integration.message.StringMessage; -import org.springframework.integration.selector.MessageSelector; import org.springframework.test.context.ContextConfiguration; import org.springframework.test.context.junit4.SpringJUnit4ClassRunner; import org.springframework.util.StringUtils; diff --git a/spring-integration-core/src/test/java/org/springframework/integration/config/SelectorChainParserTests.java b/spring-integration-core/src/test/java/org/springframework/integration/config/SelectorChainParserTests.java index 2e3314ff62..f3d0422375 100644 --- a/spring-integration-core/src/test/java/org/springframework/integration/config/SelectorChainParserTests.java +++ b/spring-integration-core/src/test/java/org/springframework/integration/config/SelectorChainParserTests.java @@ -28,8 +28,8 @@ import org.springframework.beans.DirectFieldAccessor; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.context.ApplicationContext; import org.springframework.integration.core.Message; +import org.springframework.integration.core.MessageSelector; import org.springframework.integration.message.StringMessage; -import org.springframework.integration.selector.MessageSelector; import org.springframework.integration.selector.MessageSelectorChain; import org.springframework.integration.selector.MessageSelectorChain.VotingStrategy; import org.springframework.test.context.ContextConfiguration; diff --git a/spring-integration-core/src/test/java/org/springframework/integration/config/StubMessageSelector.java b/spring-integration-core/src/test/java/org/springframework/integration/config/StubMessageSelector.java index 5c245dc439..8160375efd 100644 --- a/spring-integration-core/src/test/java/org/springframework/integration/config/StubMessageSelector.java +++ b/spring-integration-core/src/test/java/org/springframework/integration/config/StubMessageSelector.java @@ -18,7 +18,7 @@ package org.springframework.integration.config; import org.springframework.beans.factory.BeanNameAware; import org.springframework.integration.core.Message; -import org.springframework.integration.selector.MessageSelector; +import org.springframework.integration.core.MessageSelector; /** * @author Mark Fisher diff --git a/spring-integration-core/src/test/java/org/springframework/integration/config/TestSelector.java b/spring-integration-core/src/test/java/org/springframework/integration/config/TestSelector.java index a5ef62ef20..ea029eeb50 100644 --- a/spring-integration-core/src/test/java/org/springframework/integration/config/TestSelector.java +++ b/spring-integration-core/src/test/java/org/springframework/integration/config/TestSelector.java @@ -17,7 +17,7 @@ package org.springframework.integration.config; import org.springframework.integration.core.Message; -import org.springframework.integration.selector.MessageSelector; +import org.springframework.integration.core.MessageSelector; /** * @author Mark Fisher diff --git a/spring-integration-core/src/test/java/org/springframework/integration/config/TopLevelSelectorParserTests.java b/spring-integration-core/src/test/java/org/springframework/integration/config/TopLevelSelectorParserTests.java index c0abbd9306..c495725fe7 100644 --- a/spring-integration-core/src/test/java/org/springframework/integration/config/TopLevelSelectorParserTests.java +++ b/spring-integration-core/src/test/java/org/springframework/integration/config/TopLevelSelectorParserTests.java @@ -23,8 +23,8 @@ import org.junit.runner.RunWith; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.context.ApplicationContext; +import org.springframework.integration.core.MessageSelector; import org.springframework.integration.message.StringMessage; -import org.springframework.integration.selector.MessageSelector; import org.springframework.test.context.ContextConfiguration; import org.springframework.test.context.junit4.SpringJUnit4ClassRunner; diff --git a/spring-integration-core/src/test/java/org/springframework/integration/config/xml/MethodInvokingSelectorParserTests.java b/spring-integration-core/src/test/java/org/springframework/integration/config/xml/MethodInvokingSelectorParserTests.java index 56b37adc22..8ca616bddc 100644 --- a/spring-integration-core/src/test/java/org/springframework/integration/config/xml/MethodInvokingSelectorParserTests.java +++ b/spring-integration-core/src/test/java/org/springframework/integration/config/xml/MethodInvokingSelectorParserTests.java @@ -27,8 +27,8 @@ import org.junit.runner.RunWith; import org.springframework.beans.DirectFieldAccessor; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.integration.core.Message; +import org.springframework.integration.core.MessageSelector; import org.springframework.integration.filter.MethodInvokingSelector; -import org.springframework.integration.selector.MessageSelector; import org.springframework.integration.selector.MessageSelectorChain; import org.springframework.test.context.ContextConfiguration; import org.springframework.test.context.junit4.SpringJUnit4ClassRunner; diff --git a/spring-integration-core/src/test/java/org/springframework/integration/filter/MessageFilterTests.java b/spring-integration-core/src/test/java/org/springframework/integration/filter/MessageFilterTests.java index 59bb1d421e..6ca87d47e3 100644 --- a/spring-integration-core/src/test/java/org/springframework/integration/filter/MessageFilterTests.java +++ b/spring-integration-core/src/test/java/org/springframework/integration/filter/MessageFilterTests.java @@ -26,11 +26,11 @@ import org.junit.Test; import org.springframework.integration.channel.DirectChannel; import org.springframework.integration.channel.QueueChannel; import org.springframework.integration.core.Message; +import org.springframework.integration.core.MessageSelector; import org.springframework.integration.endpoint.EventDrivenConsumer; import org.springframework.integration.filter.MessageFilter; import org.springframework.integration.message.MessageRejectedException; import org.springframework.integration.message.StringMessage; -import org.springframework.integration.selector.MessageSelector; /** * @author Mark Fisher diff --git a/spring-integration-core/src/test/java/org/springframework/integration/router/RecipientListRouterTests.java b/spring-integration-core/src/test/java/org/springframework/integration/router/RecipientListRouterTests.java index 7106db9835..726317384a 100644 --- a/spring-integration-core/src/test/java/org/springframework/integration/router/RecipientListRouterTests.java +++ b/spring-integration-core/src/test/java/org/springframework/integration/router/RecipientListRouterTests.java @@ -31,9 +31,9 @@ import org.springframework.integration.channel.QueueChannel; import org.springframework.integration.core.Message; import org.springframework.integration.core.MessageChannel; import org.springframework.integration.core.MessageDeliveryException; +import org.springframework.integration.core.MessageSelector; import org.springframework.integration.message.StringMessage; import org.springframework.integration.router.RecipientListRouter.Recipient; -import org.springframework.integration.selector.MessageSelector; /** * @author Mark Fisher diff --git a/spring-integration-core/src/test/java/org/springframework/integration/selector/MessageSelectorChainTests.java b/spring-integration-core/src/test/java/org/springframework/integration/selector/MessageSelectorChainTests.java index 2aa443b956..7a2805ef4c 100644 --- a/spring-integration-core/src/test/java/org/springframework/integration/selector/MessageSelectorChainTests.java +++ b/spring-integration-core/src/test/java/org/springframework/integration/selector/MessageSelectorChainTests.java @@ -22,6 +22,7 @@ import static org.junit.Assert.assertTrue; import org.junit.Test; import org.springframework.integration.core.Message; +import org.springframework.integration.core.MessageSelector; import org.springframework.integration.message.StringMessage; /** diff --git a/spring-integration-security/src/test/java/org/springframework/integration/security/config/SecuredChannelsParserTests.java b/spring-integration-security/src/test/java/org/springframework/integration/security/config/SecuredChannelsParserTests.java index 309955f269..6d1c6127ad 100644 --- a/spring-integration-security/src/test/java/org/springframework/integration/security/config/SecuredChannelsParserTests.java +++ b/spring-integration-security/src/test/java/org/springframework/integration/security/config/SecuredChannelsParserTests.java @@ -39,9 +39,9 @@ import org.springframework.integration.channel.AbstractPollableChannel; import org.springframework.integration.channel.ChannelInterceptor; import org.springframework.integration.core.Message; import org.springframework.integration.core.MessageChannel; +import org.springframework.integration.core.MessageSelector; import org.springframework.integration.security.channel.ChannelAccessPolicy; import org.springframework.integration.security.channel.ChannelSecurityInterceptor; -import org.springframework.integration.selector.MessageSelector; import org.springframework.security.access.ConfigAttribute; import org.springframework.security.access.SecurityConfig; import org.springframework.test.context.ContextConfiguration; diff --git a/spring-integration-xml/src/main/java/org/springframework/integration/xml/selector/AbstractXPathMessageSelector.java b/spring-integration-xml/src/main/java/org/springframework/integration/xml/selector/AbstractXPathMessageSelector.java index fd457b477d..24c963e51d 100644 --- a/spring-integration-xml/src/main/java/org/springframework/integration/xml/selector/AbstractXPathMessageSelector.java +++ b/spring-integration-xml/src/main/java/org/springframework/integration/xml/selector/AbstractXPathMessageSelector.java @@ -19,7 +19,7 @@ package org.springframework.integration.xml.selector; import java.util.HashMap; import java.util.Map; -import org.springframework.integration.selector.MessageSelector; +import org.springframework.integration.core.MessageSelector; import org.springframework.integration.xml.DefaultXmlPayloadConverter; import org.springframework.integration.xml.XmlPayloadConverter; import org.springframework.xml.xpath.XPathExpression; diff --git a/spring-integration-xml/src/main/java/org/springframework/integration/xml/selector/BooleanTestXPathMessageSelector.java b/spring-integration-xml/src/main/java/org/springframework/integration/xml/selector/BooleanTestXPathMessageSelector.java index c374e73291..3116f62419 100644 --- a/spring-integration-xml/src/main/java/org/springframework/integration/xml/selector/BooleanTestXPathMessageSelector.java +++ b/spring-integration-xml/src/main/java/org/springframework/integration/xml/selector/BooleanTestXPathMessageSelector.java @@ -22,7 +22,7 @@ import org.w3c.dom.Document; import org.w3c.dom.Node; import org.springframework.integration.core.Message; -import org.springframework.integration.selector.MessageSelector; +import org.springframework.integration.core.MessageSelector; import org.springframework.xml.xpath.XPathExpression; /** diff --git a/spring-integration-xml/src/main/java/org/springframework/integration/xml/selector/StringValueTestXPathMessageSelector.java b/spring-integration-xml/src/main/java/org/springframework/integration/xml/selector/StringValueTestXPathMessageSelector.java index 1b76eb0931..ae1c21e468 100644 --- a/spring-integration-xml/src/main/java/org/springframework/integration/xml/selector/StringValueTestXPathMessageSelector.java +++ b/spring-integration-xml/src/main/java/org/springframework/integration/xml/selector/StringValueTestXPathMessageSelector.java @@ -22,7 +22,7 @@ import org.w3c.dom.Document; import org.w3c.dom.Node; import org.springframework.integration.core.Message; -import org.springframework.integration.selector.MessageSelector; +import org.springframework.integration.core.MessageSelector; import org.springframework.xml.xpath.XPathExpression; /** diff --git a/spring-integration-xml/src/test/java/org/springframework/integration/xml/config/XPathSelectorParserTests.java b/spring-integration-xml/src/test/java/org/springframework/integration/xml/config/XPathSelectorParserTests.java index 7aeaccfad5..9981763e82 100644 --- a/spring-integration-xml/src/test/java/org/springframework/integration/xml/config/XPathSelectorParserTests.java +++ b/spring-integration-xml/src/test/java/org/springframework/integration/xml/config/XPathSelectorParserTests.java @@ -23,7 +23,7 @@ import org.junit.Test; import org.w3c.dom.Document; import org.springframework.integration.core.GenericMessage; -import org.springframework.integration.selector.MessageSelector; +import org.springframework.integration.core.MessageSelector; import org.springframework.integration.xml.util.XmlTestUtil; /**