Spring/spring-integration
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

INT-1129 moved MessageSelector from 'selector' to 'core'

Browse Source
This commit is contained in:
Mark Fisher
2010-07-28 14:45:03 +00:00
parent 008cac18f5
commit b3b4f58ec8
32 changed files with 31 additions and 29 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
spring-integration-core/src/main/java/org/springframework/integration/channel/ChannelPurger.java
View File

@@ -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;
/**

2
spring-integration-core/src/main/java/org/springframework/integration/channel/QueueChannel.java
View File

@@ -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;
/**

2
spring-integration-core/src/main/java/org/springframework/integration/channel/interceptor/MessageSelectingInterceptor.java
View File

@@ -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

2
spring-integration-core/src/main/java/org/springframework/integration/channel/interceptor/WireTap.java
View File

@@ -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;
/**

2
spring-integration-core/src/main/java/org/springframework/integration/config/FilterFactoryBean.java
View File

@@ -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;
/**

3
spring-integration-core/src/main/java/org/springframework/integration/selector/MessageSelector.java → spring-integration-core/src/main/java/org/springframework/integration/core/MessageSelector.java
View File

@@ -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.

1
spring-integration-core/src/main/java/org/springframework/integration/core/MessagingTemplate.java
View File

@@ -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;

2
spring-integration-core/src/main/java/org/springframework/integration/filter/AbstractMessageProcessingSelector.java
View File

@@ -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;
/**

2
spring-integration-core/src/main/java/org/springframework/integration/filter/ExpressionEvaluatingSelector.java
View File

@@ -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.

2
spring-integration-core/src/main/java/org/springframework/integration/filter/MessageFilter.java
View File

@@ -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;
/**

2
spring-integration-core/src/main/java/org/springframework/integration/filter/MethodInvokingSelector.java
View File

@@ -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;
/**

2
spring-integration-core/src/main/java/org/springframework/integration/router/RecipientListRouter.java
View File

@@ -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;
/**

1
spring-integration-core/src/main/java/org/springframework/integration/selector/MessageSelectorChain.java
View File

@@ -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;
/**

1
spring-integration-core/src/main/java/org/springframework/integration/selector/PayloadTypeSelector.java
View File

@@ -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;
/**

1
spring-integration-core/src/main/java/org/springframework/integration/selector/UnexpiredMessageSelector.java
View File

@@ -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

2
spring-integration-core/src/test/java/org/springframework/integration/channel/ChannelPurgerTests.java
View File

@@ -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

2
spring-integration-core/src/test/java/org/springframework/integration/channel/interceptor/MessageSelectingInterceptorTests.java
View File

@@ -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

2
spring-integration-core/src/test/java/org/springframework/integration/channel/interceptor/WireTapTests.java
View File

@@ -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

2
spring-integration-core/src/test/java/org/springframework/integration/config/FilterParserTests.java
View File

@@ -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;

2
spring-integration-core/src/test/java/org/springframework/integration/config/SelectorChainParserTests.java
View File

@@ -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;

2
spring-integration-core/src/test/java/org/springframework/integration/config/StubMessageSelector.java
View File

@@ -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

2
spring-integration-core/src/test/java/org/springframework/integration/config/TestSelector.java
View File

@@ -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

2
spring-integration-core/src/test/java/org/springframework/integration/config/TopLevelSelectorParserTests.java
View File

@@ -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;

2
spring-integration-core/src/test/java/org/springframework/integration/config/xml/MethodInvokingSelectorParserTests.java
View File

@@ -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;

2
spring-integration-core/src/test/java/org/springframework/integration/filter/MessageFilterTests.java
View File

@@ -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

2
spring-integration-core/src/test/java/org/springframework/integration/router/RecipientListRouterTests.java
View File

@@ -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

1
spring-integration-core/src/test/java/org/springframework/integration/selector/MessageSelectorChainTests.java
View File

@@ -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;
/**

2
spring-integration-security/src/test/java/org/springframework/integration/security/config/SecuredChannelsParserTests.java
View File

@@ -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;

2
spring-integration-xml/src/main/java/org/springframework/integration/xml/selector/AbstractXPathMessageSelector.java
View File

@@ -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;

2
spring-integration-xml/src/main/java/org/springframework/integration/xml/selector/BooleanTestXPathMessageSelector.java
View File

@@ -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;
/**

2
spring-integration-xml/src/main/java/org/springframework/integration/xml/selector/StringValueTestXPathMessageSelector.java
View File

@@ -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;
/**

2
spring-integration-xml/src/test/java/org/springframework/integration/xml/config/XPathSelectorParserTests.java
View File

@@ -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;
/**