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

Simplified RecipientListChannelResolver. It now requires a List of MessageChannel instances rather than also allowing channel names.

Browse Source
This commit is contained in:
Mark Fisher
2008-09-29 20:01:26 +00:00
parent a7dcd5f31f
commit 0c35a1781e
2 changed files with 28 additions and 77 deletions
Download Patch File Download Diff File Expand all files Collapse all files

30
org.springframework.integration/src/main/java/org/springframework/integration/router/RecipientListChannelResolver.java
View File

@@ -16,21 +16,20 @@
package org.springframework.integration.router;
import java.util.ArrayList;
import java.util.Collection;
import java.util.List;
import org.springframework.beans.factory.InitializingBean;
import org.springframework.integration.ConfigurationException;
import org.springframework.integration.channel.MessageChannel;
import org.springframework.integration.message.Message;
import org.springframework.util.Assert;
/**
* A {@link ChannelResolver} implementation that routes to a statically
* configured list of recipients. The recipients are provided either as a list
* of {@link MessageChannel} instances or as a String array of channel names.
* For dynamic recipient lists, either implement {@link ChannelResolver} or
* extend the {@link AbstractMultiChannelNameResolver} base class.
* configured list of recipients. The recipients are provided as a list of
* {@link MessageChannel} instances. For dynamic recipient lists, consider
* either implementing the {@link ChannelResolver} interface directly or
* extending the {@link AbstractMultiChannelNameResolver} base class.
*
* @author Mark Fisher
*/
@@ -38,33 +37,18 @@ public class RecipientListChannelResolver extends AbstractChannelResolver implem
private volatile List<MessageChannel> channels;
private volatile String[] channelNames;
public void setChannels(List<MessageChannel> channels) {
Assert.notEmpty(channels, "a non-empty channel list is required");
this.channels = channels;
}
public void setChannelNames(String[] channelNames) {
this.channelNames = channelNames;
}
public void afterPropertiesSet() {
if ((this.channels != null && this.channelNames != null)
|| (this.channels == null && this.channelNames == null)) {
throw new ConfigurationException("either 'channels' or 'channelNames' should be provided, but not both");
}
Assert.notEmpty(this.channels, "a non-empty channel list is required");
}
@Override
public Collection<MessageChannel> resolveChannels(Message<?> message) {
if (this.channels == null && this.channelNames != null) {
List<MessageChannel> resolved = new ArrayList<MessageChannel>();
for (String channelName : channelNames) {
resolved.add(this.lookupChannel(channelName, true));
}
return resolved;
}
return this.channels;
}

75
org.springframework.integration/src/test/java/org/springframework/integration/router/RecipientListRouterTests.java
View File

@@ -23,13 +23,11 @@ import static org.junit.Assert.assertTrue;
import java.util.ArrayList;
import java.util.Collection;
import java.util.Collections;
import java.util.List;
import org.junit.Test;
import org.springframework.integration.ConfigurationException;
import org.springframework.integration.channel.ChannelRegistry;
import org.springframework.integration.channel.TestChannelRegistry;
import org.springframework.integration.channel.MessageChannel;
import org.springframework.integration.channel.QueueChannel;
import org.springframework.integration.message.Message;
@@ -79,68 +77,37 @@ public class RecipientListRouterTests {
}
@Test
public void routeWithChannelNames() {
QueueChannel channel1 = new QueueChannel();
QueueChannel channel2 = new QueueChannel();
channel1.setBeanName("channel1");
channel2.setBeanName("channel2");
ChannelRegistry channelRegistry = new TestChannelRegistry();
channelRegistry.registerChannel(channel1);
channelRegistry.registerChannel(channel2);
public void routeToSingleChannel() {
QueueChannel channel = new QueueChannel();
channel.setBeanName("channel");
RecipientListChannelResolver resolver = new RecipientListChannelResolver();
resolver.setChannelNames(new String[] {"channel1", "channel2"});
resolver.afterPropertiesSet();
resolver.setChannels(Collections.singletonList((MessageChannel) channel));
RouterEndpoint endpoint = new RouterEndpoint(resolver);
endpoint.setChannelRegistry(channelRegistry);
Message<String> message = new StringMessage("test");
endpoint.onMessage(message);
Message<?> result1 = channel1.receive(25);
Message<?> result1 = channel.receive(25);
assertNotNull(result1);
assertEquals("test", result1.getPayload());
Message<?> result2 = channel2.receive(25);
assertNotNull(result2);
assertEquals("test", result2.getPayload());
}
@Test
public void routeToSingleChannelByName() {
QueueChannel channel1 = new QueueChannel();
QueueChannel channel2 = new QueueChannel();
channel1.setBeanName("channel1");
channel2.setBeanName("channel2");
ChannelRegistry channelRegistry = new TestChannelRegistry();
channelRegistry.registerChannel(channel1);
channelRegistry.registerChannel(channel2);
RecipientListChannelResolver resolver = new RecipientListChannelResolver();
resolver.setChannelNames(new String[] {"channel1"});
resolver.afterPropertiesSet();
RouterEndpoint endpoint = new RouterEndpoint(resolver);
endpoint.setChannelRegistry(channelRegistry);
Message<String> message = new StringMessage("test");
endpoint.onMessage(message);
Message<?> result1 = channel1.receive(25);
assertNotNull(result1);
assertEquals("test", result1.getPayload());
Message<?> result2 = channel2.receive(5);
Message<?> result2 = channel.receive(5);
assertNull(result2);
}
@Test(expected = ConfigurationException.class)
public void configurationExceptionWhenBothChannelsAndNamesAreProvided() {
QueueChannel channel1 = new QueueChannel();
QueueChannel channel2 = new QueueChannel();
channel1.setBeanName("channel1");
channel2.setBeanName("channel2");
List<MessageChannel> channels = new ArrayList<MessageChannel>();
channels.add(channel1);
channels.add(channel2);
ChannelRegistry channelRegistry = new TestChannelRegistry();
channelRegistry.registerChannel(channel1);
channelRegistry.registerChannel(channel2);
@Test(expected = IllegalArgumentException.class)
public void nullChannelListNotSettable() {
RecipientListChannelResolver resolver = new RecipientListChannelResolver();
resolver.setChannels(null);
}
@Test(expected = IllegalArgumentException.class)
public void emptyChannelListNotSettable() {
RecipientListChannelResolver resolver = new RecipientListChannelResolver();
List<MessageChannel> channels = new ArrayList<MessageChannel>();
resolver.setChannels(channels);
resolver.setChannelNames(new String[] {"channel1"});
resolver.setChannelRegistry(channelRegistry);
}
@Test(expected = IllegalArgumentException.class)
public void nullChannelListFailsInitialization() {
RecipientListChannelResolver resolver = new RecipientListChannelResolver();
resolver.afterPropertiesSet();
}