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

FilterEndpoint is now MessageFilter.

Browse Source
This commit is contained in:
Mark Fisher
2008-10-07 01:06:22 +00:00
parent 95b9212c9f
commit 0250529aa2
3 changed files with 13 additions and 12 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
org.springframework.integration/src/main/java/org/springframework/integration/config/FilterParser.java
View File

@@ -20,7 +20,7 @@ import org.w3c.dom.Element;
import org.springframework.beans.factory.support.BeanDefinitionBuilder;
import org.springframework.beans.factory.xml.ParserContext;
import org.springframework.integration.filter.FilterEndpoint;
import org.springframework.integration.filter.MessageFilter;
import org.springframework.integration.filter.MethodInvokingSelector;
/**
@@ -32,7 +32,7 @@ public class FilterParser extends AbstractEndpointParser {
@Override
protected BeanDefinitionBuilder parseConsumer(Element element, ParserContext parserContext) {
BeanDefinitionBuilder builder = BeanDefinitionBuilder.genericBeanDefinition(FilterEndpoint.class);
BeanDefinitionBuilder builder = BeanDefinitionBuilder.genericBeanDefinition(MessageFilter.class);
builder.addConstructorArgReference(this.parseAdapter(element, parserContext, MethodInvokingSelector.class));
return builder;
}

9
org.springframework.integration/src/main/java/org/springframework/integration/filter/FilterEndpoint.java → org.springframework.integration/src/main/java/org/springframework/integration/filter/MessageFilter.java
View File

@@ -22,17 +22,18 @@ import org.springframework.integration.message.selector.MessageSelector;
import org.springframework.util.Assert;
/**
* Message Endpoint that decides whether to pass a message along to its
* output channel. Delegates to a {@link MessageSelector}.
* Message Consumer that delegates to a {@link MessageSelector}. If and only if
* the selector {@link MessageSelector#accept(Message) accepts} the Message, it
* will be passed to this filter's output channel.
*
* @author Mark Fisher
*/
public class FilterEndpoint extends AbstractReplyProducingMessageConsumer {
public class MessageFilter extends AbstractReplyProducingMessageConsumer {
private MessageSelector selector;
public FilterEndpoint(MessageSelector selector) {
public MessageFilter(MessageSelector selector) {
Assert.notNull(selector, "selector must not be null");
this.selector = selector;
}

12
org.springframework.integration/src/test/java/org/springframework/integration/filter/FilterEndpointTests.java → org.springframework.integration/src/test/java/org/springframework/integration/filter/MessageFilterTests.java
View File

@@ -26,7 +26,7 @@ import org.junit.Test;
import org.springframework.integration.channel.DirectChannel;
import org.springframework.integration.channel.QueueChannel;
import org.springframework.integration.endpoint.SubscribingConsumerEndpoint;
import org.springframework.integration.filter.FilterEndpoint;
import org.springframework.integration.filter.MessageFilter;
import org.springframework.integration.message.Message;
import org.springframework.integration.message.StringMessage;
import org.springframework.integration.message.selector.MessageSelector;
@@ -34,11 +34,11 @@ import org.springframework.integration.message.selector.MessageSelector;
/**
* @author Mark Fisher
*/
public class FilterEndpointTests {
public class MessageFilterTests {
@Test
public void filterAcceptsMessage() {
FilterEndpoint filter = new FilterEndpoint(new MessageSelector() {
MessageFilter filter = new MessageFilter(new MessageSelector() {
public boolean accept(Message<?> message) {
return true;
}
@@ -49,7 +49,7 @@ public class FilterEndpointTests {
@Test
public void filterRejectsMessage() {
FilterEndpoint filter = new FilterEndpoint(new MessageSelector() {
MessageFilter filter = new MessageFilter(new MessageSelector() {
public boolean accept(Message<?> message) {
return false;
}
@@ -61,7 +61,7 @@ public class FilterEndpointTests {
public void filterAcceptsWithChannels() {
DirectChannel inputChannel = new DirectChannel();
QueueChannel outputChannel = new QueueChannel();
FilterEndpoint filter = new FilterEndpoint(new MessageSelector() {
MessageFilter filter = new MessageFilter(new MessageSelector() {
public boolean accept(Message<?> message) {
return true;
}
@@ -80,7 +80,7 @@ public class FilterEndpointTests {
public void filterRejectsWithChannels() {
DirectChannel inputChannel = new DirectChannel();
QueueChannel outputChannel = new QueueChannel();
FilterEndpoint filter = new FilterEndpoint(new MessageSelector() {
MessageFilter filter = new MessageFilter(new MessageSelector() {
public boolean accept(Message<?> message) {
return false;
}