From 9f8b4d93a598680c7cb60032802e7befe18141e9 Mon Sep 17 00:00:00 2001 From: Oleg Zhurakousky Date: Wed, 13 Oct 2010 10:53:43 -0400 Subject: [PATCH] INT-1377, deleted AbstractSingleChannelRouter and the corresponding tests --- .../router/AbstractSingleChannelRouter.java | 44 --------- .../router/SingleChannelRouterTests.java | 93 ------------------- 2 files changed, 137 deletions(-) delete mode 100644 spring-integration-core/src/main/java/org/springframework/integration/router/AbstractSingleChannelRouter.java delete mode 100644 spring-integration-core/src/test/java/org/springframework/integration/router/SingleChannelRouterTests.java diff --git a/spring-integration-core/src/main/java/org/springframework/integration/router/AbstractSingleChannelRouter.java b/spring-integration-core/src/main/java/org/springframework/integration/router/AbstractSingleChannelRouter.java deleted file mode 100644 index a160d2fa20..0000000000 --- a/spring-integration-core/src/main/java/org/springframework/integration/router/AbstractSingleChannelRouter.java +++ /dev/null @@ -1,44 +0,0 @@ -/* - * Copyright 2002-2008 the original author or authors. - * - * Licensed under the Apache License, Version 2.0 (the "License"); - * you may not use this file except in compliance with the License. - * You may obtain a copy of the License at - * - * http://www.apache.org/licenses/LICENSE-2.0 - * - * Unless required by applicable law or agreed to in writing, software - * distributed under the License is distributed on an "AS IS" BASIS, - * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. - * See the License for the specific language governing permissions and - * limitations under the License. - */ - -package org.springframework.integration.router; - -import java.util.Collection; -import java.util.Collections; - -import org.springframework.integration.Message; -import org.springframework.integration.MessageChannel; - -/** - * 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 determineTargetChannels(Message message) { - MessageChannel channel = this.determineTargetChannel(message); - return (channel != null) ? Collections.singletonList(channel) : null; - } - - /** - * Subclasses must implement this method to return the target channel. - */ - protected abstract MessageChannel determineTargetChannel(Message message); - -} diff --git a/spring-integration-core/src/test/java/org/springframework/integration/router/SingleChannelRouterTests.java b/spring-integration-core/src/test/java/org/springframework/integration/router/SingleChannelRouterTests.java deleted file mode 100644 index 8dd2a15526..0000000000 --- a/spring-integration-core/src/test/java/org/springframework/integration/router/SingleChannelRouterTests.java +++ /dev/null @@ -1,93 +0,0 @@ -/* - * Copyright 2002-2010 the original author or authors. - * - * Licensed under the Apache License, Version 2.0 (the "License"); - * you may not use this file except in compliance with the License. - * You may obtain a copy of the License at - * - * http://www.apache.org/licenses/LICENSE-2.0 - * - * Unless required by applicable law or agreed to in writing, software - * distributed under the License is distributed on an "AS IS" BASIS, - * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. - * See the License for the specific language governing permissions and - * limitations under the License. - */ - -package org.springframework.integration.router; - -import static org.junit.Assert.assertEquals; -import static org.junit.Assert.assertNotNull; - -import org.junit.Test; - -import org.springframework.integration.Message; -import org.springframework.integration.MessageChannel; -import org.springframework.integration.MessagingException; -import org.springframework.integration.channel.QueueChannel; -import org.springframework.integration.channel.TestChannelResolver; -import org.springframework.integration.message.GenericMessage; - -/** - * @author Mark Fisher - */ -public class SingleChannelRouterTests { - - @Test - public void routeWithChannelResolver() { - final QueueChannel channel = new QueueChannel(); - AbstractSingleChannelRouter router = new AbstractSingleChannelRouter() { - public MessageChannel determineTargetChannel(Message message) { - return channel; - } - }; - Message message = new GenericMessage("test"); - router.handleMessage(message); - Message result = channel.receive(25); - assertNotNull(result); - assertEquals("test", result.getPayload()); - } - - @Test - public void routeWithChannelNameResolver() { - AbstractSingleChannelNameRouter router = new AbstractSingleChannelNameRouter() { - public String determineTargetChannelName(Message message) { - return "testChannel"; - } - }; - QueueChannel channel = new QueueChannel(); - TestChannelResolver channelResolver = new TestChannelResolver(); - channelResolver.addChannel("testChannel", channel); - router.setChannelResolver(channelResolver); - Message message = new GenericMessage("test"); - router.handleMessage(message); - Message result = channel.receive(25); - assertNotNull(result); - assertEquals("test", result.getPayload()); - } - - @Test - public void nullChannelResultIgnored() { - AbstractSingleChannelRouter router = new AbstractSingleChannelRouter() { - public MessageChannel determineTargetChannel(Message message) { - return null; - } - }; - Message message = new GenericMessage("test"); - router.handleMessage(message); - } - - @Test(expected = MessagingException.class) - public void channelNameResolutionFailure() { - AbstractSingleChannelNameRouter router = new AbstractSingleChannelNameRouter() { - public String determineTargetChannelName(Message message) { - return "noSuchChannel"; - } - }; - TestChannelResolver channelResolver = new TestChannelResolver(); - router.setChannelResolver(channelResolver); - Message message = new GenericMessage("test"); - router.handleMessage(message); - } - -}