diff --git a/org.springframework.integration.xml/src/main/java/org/springframework/integration/xml/router/XPathMultiChannelRouter.java b/org.springframework.integration.xml/src/main/java/org/springframework/integration/xml/router/XPathMultiChannelRouter.java index dfc4ca906c..f3643cf00b 100644 --- a/org.springframework.integration.xml/src/main/java/org/springframework/integration/xml/router/XPathMultiChannelRouter.java +++ b/org.springframework.integration.xml/src/main/java/org/springframework/integration/xml/router/XPathMultiChannelRouter.java @@ -77,7 +77,7 @@ public class XPathMultiChannelRouter extends AbstractXPathRouter { } @SuppressWarnings("unchecked") - public String[] resolveChannelNames(Message message) { + public String[] determineTargetChannelNames(Message message) { Node node = getConverter().convertToNode(message.getPayload()); List channelNamesList = getXPathExpression().evaluate(node, this.nodeMapper); return (String[]) channelNamesList.toArray(new String[channelNamesList.size()]); diff --git a/org.springframework.integration.xml/src/main/java/org/springframework/integration/xml/router/XPathSingleChannelRouter.java b/org.springframework.integration.xml/src/main/java/org/springframework/integration/xml/router/XPathSingleChannelRouter.java index 752b3e816f..6342c58109 100644 --- a/org.springframework.integration.xml/src/main/java/org/springframework/integration/xml/router/XPathSingleChannelRouter.java +++ b/org.springframework.integration.xml/src/main/java/org/springframework/integration/xml/router/XPathSingleChannelRouter.java @@ -73,7 +73,7 @@ public class XPathSingleChannelRouter extends AbstractXPathRouter { * @throws MessagingException if the {@link XPathExpression} evaluates to * an empty string */ - public String[] resolveChannelNames(Message message) { + public String[] determineTargetChannelNames(Message message) { Node node = getConverter().convertToNode(message.getPayload()); String result = getXPathExpression().evaluateAsString(node); if ("".equals(result)) { 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 0bdb923e4d..7368b295bc 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 @@ -39,7 +39,7 @@ public class XPathRouterParserTests { TestXmlApplicationContext ctx = TestXmlApplicationContextHelper.getTestAppContext( ""); XPathSingleChannelRouter router = (XPathSingleChannelRouter) ctx.getBean("router"); - String[] channelNames = router.resolveChannelNames(docMessage); + String[] channelNames = router.determineTargetChannelNames(docMessage); assertEquals("Wrong number of channel names returned", 1, channelNames.length); assertEquals("Wrong channel name", "outputOne", channelNames[0]); } @@ -51,7 +51,7 @@ public class XPathRouterParserTests { TestXmlApplicationContext ctx = TestXmlApplicationContextHelper.getTestAppContext( ""); XPathSingleChannelRouter router = (XPathSingleChannelRouter) ctx.getBean("router"); - String[] channelNames = router.resolveChannelNames(docMessage); + String[] channelNames = router.determineTargetChannelNames(docMessage); assertEquals("Wrong number of channel names returned", 1, channelNames.length); assertEquals("Wrong channel name", "outputOne", channelNames[0]); } @@ -67,7 +67,7 @@ public class XPathRouterParserTests { buffer.append(""); TestXmlApplicationContext ctx = TestXmlApplicationContextHelper.getTestAppContext(buffer.toString()); XPathSingleChannelRouter router = (XPathSingleChannelRouter) ctx.getBean("router"); - String[] channelNames = router.resolveChannelNames(docMessage); + String[] channelNames = router.determineTargetChannelNames(docMessage); assertEquals("Wrong number of channel names returned", 1, channelNames.length); assertEquals("Wrong channel name", "outputOne", channelNames[0]); } @@ -83,7 +83,7 @@ public class XPathRouterParserTests { buffer.append(""); TestXmlApplicationContext ctx = TestXmlApplicationContextHelper.getTestAppContext(buffer.toString()); XPathSingleChannelRouter router = (XPathSingleChannelRouter) ctx.getBean("router"); - String[] channelNames = router.resolveChannelNames(docMessage); + String[] channelNames = router.determineTargetChannelNames(docMessage); assertEquals("Wrong number of channel names returned", 1, channelNames.length); assertEquals("Wrong channel name", "outputOne", channelNames[0]); } 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 b7435b161e..45d174db52 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 @@ -89,7 +89,7 @@ public class XsltPayloadTransformerParserTests { } @Test - public void testWithResourceProvidedndStubResultFactory() throws Exception { + public void testWithResourceProvidedAndStubResultFactory() throws Exception { MessageChannel input = (MessageChannel) applicationContext.getBean("withTemplatesAndResultFactoryIn"); GenericMessage message = new GenericMessage(XmlTestUtil.getDomSourceForString(doc)); input.send(message); diff --git a/org.springframework.integration.xml/src/test/java/org/springframework/integration/xml/router/XPathMultiChannelRouterTests.java b/org.springframework.integration.xml/src/test/java/org/springframework/integration/xml/router/XPathMultiChannelRouterTests.java index 554a832a87..8de9bf3c1d 100644 --- a/org.springframework.integration.xml/src/test/java/org/springframework/integration/xml/router/XPathMultiChannelRouterTests.java +++ b/org.springframework.integration.xml/src/test/java/org/springframework/integration/xml/router/XPathMultiChannelRouterTests.java @@ -36,22 +36,22 @@ public class XPathMultiChannelRouterTests { @Test @SuppressWarnings("unchecked") - public void testSimpleSingleeAttribute() throws Exception { + public void simpleSingleAttribute() throws Exception { Document doc = XmlTestUtil.getDocumentForString(""); XPathExpression expression = XPathExpressionFactory.createXPathExpression("/doc/@type"); XPathMultiChannelRouter router = new XPathMultiChannelRouter(expression); - String[] channelNames = router.resolveChannelNames(new GenericMessage(doc)); + String[] channelNames = router.determineTargetChannelNames(new GenericMessage(doc)); assertEquals("Wrong number of channels returned", 1, channelNames.length); assertEquals("Wrong channel name", "one", channelNames[0]); } @Test @SuppressWarnings("unchecked") - public void testMultipleNodeValues() throws Exception { + public void multipleNodeValues() throws Exception { Document doc = XmlTestUtil.getDocumentForString("bOnebTwo"); XPathExpression expression = XPathExpressionFactory.createXPathExpression("/doc/book"); XPathMultiChannelRouter router = new XPathMultiChannelRouter(expression); - String[] channelNames = router.resolveChannelNames(new GenericMessage(doc)); + String[] channelNames = router.determineTargetChannelNames(new GenericMessage(doc)); assertEquals("Wrong number of channels returned", 2, channelNames.length); assertEquals("Wrong channel name", "bOne", channelNames[0]); assertEquals("Wrong channel name", "bTwo", channelNames[1]); @@ -59,27 +59,27 @@ public class XPathMultiChannelRouterTests { @Test @SuppressWarnings("unchecked") - public void testMultipleNodeValuesAsString() throws Exception { + public void multipleNodeValuesAsString() throws Exception { XPathExpression expression = XPathExpressionFactory.createXPathExpression("/doc/book"); XPathMultiChannelRouter router = new XPathMultiChannelRouter(expression); - String[] channelNames = router.resolveChannelNames(new GenericMessage("bOnebTwo")); + String[] channelNames = router.determineTargetChannelNames(new GenericMessage("bOnebTwo")); assertEquals("Wrong number of channels returned", 2, channelNames.length); assertEquals("Wrong channel name", "bOne", channelNames[0]); assertEquals("Wrong channel name", "bTwo", channelNames[1]); } @Test(expected = MessagingException.class) - public void testNonNodePayload() throws Exception { + public void nonNodePayload() throws Exception { XPathExpression expression = XPathExpressionFactory.createXPathExpression("/doc/@type"); XPathMultiChannelRouter router = new XPathMultiChannelRouter(expression); - router.resolveChannelNames(new StringMessage("test")); + router.determineTargetChannelNames(new StringMessage("test")); } @Test - public void testNodePayload() throws Exception { + public void nodePayload() throws Exception { XPathMultiChannelRouter router = new XPathMultiChannelRouter("./three/text()"); Document testDocument = XmlTestUtil.getDocumentForString("bobdave"); - String[] channelNames = router.resolveChannelNames(new GenericMessage(testDocument.getElementsByTagName("two").item(0))); + String[] channelNames = router.determineTargetChannelNames(new GenericMessage(testDocument.getElementsByTagName("two").item(0))); assertEquals("bob",channelNames[0]); assertEquals("dave",channelNames[1]); } diff --git a/org.springframework.integration.xml/src/test/java/org/springframework/integration/xml/router/XPathSingleChannelRouterTests.java b/org.springframework.integration.xml/src/test/java/org/springframework/integration/xml/router/XPathSingleChannelRouterTests.java index 95f4667c72..f421cf03fe 100644 --- a/org.springframework.integration.xml/src/test/java/org/springframework/integration/xml/router/XPathSingleChannelRouterTests.java +++ b/org.springframework.integration.xml/src/test/java/org/springframework/integration/xml/router/XPathSingleChannelRouterTests.java @@ -39,7 +39,7 @@ public class XPathSingleChannelRouterTests { Document doc = XmlTestUtil.getDocumentForString(""); XPathExpression expression = XPathExpressionFactory.createXPathExpression("/doc/@type"); XPathSingleChannelRouter router = new XPathSingleChannelRouter(expression); - String channelName = router.resolveChannelNames(new GenericMessage(doc))[0]; + String channelName = router.determineTargetChannelNames(new GenericMessage(doc))[0]; assertEquals("Wrong channel name", "one", channelName); } @@ -47,7 +47,7 @@ public class XPathSingleChannelRouterTests { public void testSimpleStringDoc() throws Exception { XPathExpression expression = XPathExpressionFactory.createXPathExpression("/doc/@type"); XPathSingleChannelRouter router = new XPathSingleChannelRouter(expression); - String channelName = router.resolveChannelNames(new GenericMessage(""))[0]; + String channelName = router.determineTargetChannelNames(new GenericMessage(""))[0]; assertEquals("Wrong channel name", "one", channelName); } @@ -55,14 +55,14 @@ public class XPathSingleChannelRouterTests { public void testNonNodePayload() throws Exception { XPathExpression expression = XPathExpressionFactory.createXPathExpression("/doc/@type"); XPathSingleChannelRouter router = new XPathSingleChannelRouter(expression); - router.resolveChannelNames(new StringMessage("test")); + router.determineTargetChannelNames(new StringMessage("test")); } @Test public void testNodePayload() throws Exception { XPathSingleChannelRouter router = new XPathSingleChannelRouter("./three/text()"); Document testDocument = XmlTestUtil.getDocumentForString("bob"); - String[] channelNames = router.resolveChannelNames(new GenericMessage( + String[] channelNames = router.determineTargetChannelNames(new GenericMessage( testDocument.getElementsByTagName("two").item(0))); assertEquals("bob", channelNames[0]); } @@ -71,7 +71,7 @@ public class XPathSingleChannelRouterTests { public void testEvaluationReturnsEmptyString() throws Exception { XPathSingleChannelRouter router = new XPathSingleChannelRouter("/yellow"); Document testDocument = XmlTestUtil.getDocumentForString("bob"); - router.resolveChannelNames(new GenericMessage(testDocument)); + router.determineTargetChannelNames(new GenericMessage(testDocument)); } } 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 69bad7b41a..5c35ba54f6 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 @@ -68,10 +68,10 @@ public abstract class AbstractChannelNameResolvingMessageRouter extends Abstract } @Override - protected final Collection resolveChannels(Message message) { + protected final Collection determineTargetChannels(Message message) { this.afterPropertiesSet(); Collection channels = new ArrayList(); - String[] channelNames = this.resolveChannelNames(message); + String[] channelNames = this.determineTargetChannelNames(message); if (channelNames == null) { return null; } @@ -99,6 +99,6 @@ public abstract class AbstractChannelNameResolvingMessageRouter extends Abstract /** * Subclasses must implement this method to return the channel name(s). */ - protected abstract String[] resolveChannelNames(Message message); + protected abstract String[] determineTargetChannelNames(Message message); } 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 f20d1e89a9..11079ac945 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 @@ -69,7 +69,7 @@ public abstract class AbstractMessageRouter extends AbstractMessageConsumer { @Override protected void onMessageInternal(Message message) { boolean sent = false; - Collection results = this.resolveChannels(message); + Collection results = this.determineTargetChannels(message); if (results != null) { for (MessageChannel channel : results) { if (channel != null) { @@ -94,6 +94,6 @@ public abstract class AbstractMessageRouter extends AbstractMessageConsumer { * Subclasses must implement this method to return the target channels for * a given Message. */ - protected abstract Collection resolveChannels(Message message); + protected abstract Collection determineTargetChannels(Message message); } diff --git a/org.springframework.integration/src/main/java/org/springframework/integration/router/AbstractSingleChannelNameRouter.java b/org.springframework.integration/src/main/java/org/springframework/integration/router/AbstractSingleChannelNameRouter.java index 9d0a4dde22..7e7cb9cc78 100644 --- a/org.springframework.integration/src/main/java/org/springframework/integration/router/AbstractSingleChannelNameRouter.java +++ b/org.springframework.integration/src/main/java/org/springframework/integration/router/AbstractSingleChannelNameRouter.java @@ -19,16 +19,22 @@ package org.springframework.integration.router; import org.springframework.integration.message.Message; /** + * Extends {@link AbstractChannelNameResolvingMessageRouter} to support router + * implementations that always return a single channel name (or null). + * * @author Mark Fisher */ public abstract class AbstractSingleChannelNameRouter extends AbstractChannelNameResolvingMessageRouter { @Override - protected final String[] resolveChannelNames(Message message) { - String channelName = this.resolveChannelName(message); + protected final String[] determineTargetChannelNames(Message message) { + String channelName = this.determineTargetChannelName(message); return (channelName != null) ? new String[] { channelName } : null; } - protected abstract String resolveChannelName(Message message); + /** + * Subclasses must implement this method to return the channel name. + */ + protected abstract String determineTargetChannelName(Message message); } 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 2c157b1bfa..32bd2acc15 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 @@ -23,16 +23,22 @@ import org.springframework.integration.channel.MessageChannel; import org.springframework.integration.message.Message; /** + * Extends {@link AbstractMessageRouter} to support router implementations that + * always return a single {@link MessageChannel} instance (or null). + * * @author Mark Fisher */ public abstract class AbstractSingleChannelRouter extends AbstractMessageRouter { @Override - protected final Collection resolveChannels(Message message) { - MessageChannel channel = this.resolveChannel(message); + protected final Collection determineTargetChannels(Message message) { + MessageChannel channel = this.determineTargetChannel(message); return (channel != null) ? Collections.singletonList(channel) : null; } - protected abstract MessageChannel resolveChannel(Message message); + /** + * Subclasses must implement this method to return the target channel. + */ + protected abstract MessageChannel determineTargetChannel(Message message); } 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 5decb75bac..e75e027222 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 @@ -43,7 +43,7 @@ public class ErrorMessageExceptionTypeRouter extends AbstractSingleChannelRouter @Override - protected MessageChannel resolveChannel(Message message) { + protected MessageChannel determineTargetChannel(Message message) { MessageChannel channel = null; Object payload = message.getPayload(); if (payload != null && (payload instanceof Throwable)) { 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 7a43060f85..713984b08b 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 @@ -67,7 +67,7 @@ public class MethodInvokingRouter extends AbstractMessageRouter implements Initi } @Override - protected final Collection resolveChannels(Message message) { + protected final Collection determineTargetChannels(Message message) { Object result = this.invoker.invokeMethod(message); if (result == null) { return null; 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 2ffbabfba2..a620443e87 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 @@ -41,7 +41,7 @@ public class PayloadTypeRouter extends AbstractSingleChannelRouter { } @Override - protected MessageChannel resolveChannel(Message message) { + protected MessageChannel determineTargetChannel(Message message) { return this.payloadTypeChannelMap.get(message.getPayload().getClass()); } 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 6f4f2c6b80..7b645a694a 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 @@ -46,7 +46,7 @@ public class RecipientListRouter extends AbstractMessageRouter implements Initia } @Override - protected Collection resolveChannels(Message message) { + protected Collection determineTargetChannels(Message message) { return this.channels; } diff --git a/org.springframework.integration/src/test/java/org/springframework/integration/router/MultiChannelRouterTests.java b/org.springframework.integration/src/test/java/org/springframework/integration/router/MultiChannelRouterTests.java index 3ba0baa0dd..12582e8cbd 100644 --- a/org.springframework.integration/src/test/java/org/springframework/integration/router/MultiChannelRouterTests.java +++ b/org.springframework.integration/src/test/java/org/springframework/integration/router/MultiChannelRouterTests.java @@ -35,7 +35,7 @@ public class MultiChannelRouterTests { @Test public void routeWithChannelMapping() { AbstractChannelNameResolvingMessageRouter router = new AbstractChannelNameResolvingMessageRouter() { - public String[] resolveChannelNames(Message message) { + public String[] determineTargetChannelNames(Message message) { return new String[] {"channel1", "channel2"}; } }; @@ -60,7 +60,7 @@ public class MultiChannelRouterTests { @Test(expected = MessagingException.class) public void channelNameLookupFailure() { AbstractChannelNameResolvingMessageRouter router = new AbstractChannelNameResolvingMessageRouter() { - public String[] resolveChannelNames(Message message) { + public String[] determineTargetChannelNames(Message message) { return new String[] {"noSuchChannel"}; } }; @@ -73,7 +73,7 @@ public class MultiChannelRouterTests { @Test(expected = MessagingException.class) public void channelMappingNotAvailable() { AbstractChannelNameResolvingMessageRouter router = new AbstractChannelNameResolvingMessageRouter() { - public String[] resolveChannelNames(Message message) { + public String[] determineTargetChannelNames(Message message) { return new String[] {"noSuchChannel"}; } }; 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 c14e712210..6541a886b7 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 @@ -46,8 +46,8 @@ public class PayloadTypeRouterTests { router.setPayloadTypeChannelMap(payloadTypeChannelMap); Message message1 = new StringMessage("test"); Message message2 = new GenericMessage(123); - MessageChannel result1 = router.resolveChannel(message1); - MessageChannel result2 = router.resolveChannel(message2); + MessageChannel result1 = router.determineTargetChannel(message1); + MessageChannel result2 = router.determineTargetChannel(message2); assertEquals(stringChannel, result1); assertEquals(integerChannel, result2); } 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 34ed291bc0..d207a37077 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 @@ -49,7 +49,7 @@ public class RecipientListRouterTests { router.setChannels(channels); router.afterPropertiesSet(); Message message = new StringMessage("test"); - Collection resolved = router.resolveChannels(message); + Collection resolved = router.determineTargetChannels(message); assertEquals(2, resolved.size()); assertTrue(resolved.contains(channel1)); assertTrue(resolved.contains(channel2)); 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 f804653921..6c5e63949b 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 @@ -40,7 +40,7 @@ public class RouterTests { @Test public void nullChannelIgnoredByDefault() { AbstractMessageRouter router = new AbstractMessageRouter() { - public List resolveChannels(Message message) { + public List determineTargetChannels(Message message) { return null; } }; @@ -51,7 +51,7 @@ public class RouterTests { @Test(expected = MessageDeliveryException.class) public void nullChannelThrowsExceptionWhenResolutionRequired() { AbstractMessageRouter router = new AbstractMessageRouter() { - public List resolveChannels(Message message) { + public List determineTargetChannels(Message message) { return null; } }; @@ -63,7 +63,7 @@ public class RouterTests { @Test public void emptyChannelListIgnoredByDefault() { AbstractMessageRouter router = new AbstractMessageRouter() { - public List resolveChannels(Message message) { + public List determineTargetChannels(Message message) { return Collections.emptyList(); } }; @@ -74,7 +74,7 @@ public class RouterTests { @Test(expected = MessageDeliveryException.class) public void emptyChannelListThrowsExceptionWhenResolutionRequired() { AbstractMessageRouter router = new AbstractMessageRouter() { - public List resolveChannels(Message message) { + public List determineTargetChannels(Message message) { return Collections.emptyList(); } }; @@ -86,7 +86,7 @@ public class RouterTests { @Test public void nullChannelNameArrayIgnoredByDefault() { AbstractChannelNameResolvingMessageRouter router = new AbstractChannelNameResolvingMessageRouter() { - public String[] resolveChannelNames(Message message) { + public String[] determineTargetChannelNames(Message message) { return null; } }; @@ -99,7 +99,7 @@ public class RouterTests { @Test(expected = MessageDeliveryException.class) public void nullChannelNameArrayThrowsExceptionWhenResolutionRequired() { AbstractChannelNameResolvingMessageRouter router = new AbstractChannelNameResolvingMessageRouter() { - public String[] resolveChannelNames(Message message) { + public String[] determineTargetChannelNames(Message message) { return null; } }; @@ -114,7 +114,7 @@ public class RouterTests { @Test public void emptyChannelNameArrayIgnoredByDefault() { AbstractChannelNameResolvingMessageRouter router = new AbstractChannelNameResolvingMessageRouter() { - public String[] resolveChannelNames(Message message) { + public String[] determineTargetChannelNames(Message message) { return new String[] {}; } }; @@ -127,7 +127,7 @@ public class RouterTests { @Test(expected = MessageDeliveryException.class) public void emptyChannelNameArrayThrowsExceptionWhenResolutionRequired() { AbstractChannelNameResolvingMessageRouter router = new AbstractChannelNameResolvingMessageRouter() { - public String[] resolveChannelNames(Message message) { + public String[] determineTargetChannelNames(Message message) { return new String[] {}; } }; @@ -141,7 +141,7 @@ public class RouterTests { @Test(expected = MessagingException.class) public void channelMappingIsRequiredWhenResolvingChannelNamesWithSingleChannelRouter() { AbstractSingleChannelNameRouter router = new AbstractSingleChannelNameRouter() { - public String resolveChannelName(Message message) { + public String determineTargetChannelName(Message message) { return "notImportant"; } }; @@ -151,7 +151,7 @@ public class RouterTests { @Test(expected = MessagingException.class) public void channelMappingIsRequiredWhenResolvingChannelNamesWithMultiChannelRouter() { AbstractChannelNameResolvingMessageRouter router = new AbstractChannelNameResolvingMessageRouter() { - public String[] resolveChannelNames(Message message) { + public String[] determineTargetChannelNames(Message message) { return new String[] { "notImportant" }; } }; @@ -161,7 +161,7 @@ public class RouterTests { @Test public void beanFactoryWithSingleChannelRouter() { AbstractSingleChannelNameRouter router = new AbstractSingleChannelNameRouter() { - public String resolveChannelName(Message message) { + public String determineTargetChannelName(Message message) { return "testChannel"; } }; @@ -177,7 +177,7 @@ public class RouterTests { @Test public void beanFactoryWithMultiChannelRouter() { AbstractChannelNameResolvingMessageRouter router = new AbstractChannelNameResolvingMessageRouter() { - public String[] resolveChannelNames(Message message) { + public String[] determineTargetChannelNames(Message message) { return new String[] { "testChannel" }; } }; 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 11c19a56e8..aaf4e037d1 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 @@ -37,7 +37,7 @@ public class SingleChannelRouterTests { public void routeWithChannelResolver() { final QueueChannel channel = new QueueChannel(); AbstractSingleChannelRouter router = new AbstractSingleChannelRouter() { - public MessageChannel resolveChannel(Message message) { + public MessageChannel determineTargetChannel(Message message) { return channel; } }; @@ -51,7 +51,7 @@ public class SingleChannelRouterTests { @Test public void routeWithChannelNameResolver() { AbstractSingleChannelNameRouter router = new AbstractSingleChannelNameRouter() { - public String resolveChannelName(Message message) { + public String determineTargetChannelName(Message message) { return "testChannel"; } }; @@ -70,7 +70,7 @@ public class SingleChannelRouterTests { @Test public void nullChannelResultIgnored() { AbstractSingleChannelRouter router = new AbstractSingleChannelRouter() { - public MessageChannel resolveChannel(Message message) { + public MessageChannel determineTargetChannel(Message message) { return null; } }; @@ -81,7 +81,7 @@ public class SingleChannelRouterTests { @Test(expected = MessagingException.class) public void channelNameResolutionFailure() { AbstractSingleChannelNameRouter router = new AbstractSingleChannelNameRouter() { - public String resolveChannelName(Message message) { + public String determineTargetChannelName(Message message) { return "noSuchChannel"; } };