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

INT-1377 removed unused AbstractSingleChannelNameRouter class

Browse Source
This commit is contained in:
Mark Fisher
2010-11-10 08:55:20 -05:00
parent 38aa676cb9
commit 8e2daea503
2 changed files with 32 additions and 78 deletions
Download Patch File Download Diff File Expand all files Collapse all files

47
spring-integration-core/src/main/java/org/springframework/integration/router/AbstractSingleChannelNameRouter.java
View File

@@ -1,47 +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 java.util.ArrayList;
import java.util.List;
import org.springframework.integration.Message;
/**
* Extends {@link AbstractMessageRouter} to support router
* implementations that always return a single channel name (or null).
*
* @author Mark Fisher
*/
public abstract class AbstractSingleChannelNameRouter extends AbstractMessageRouter {
@Override
protected final List<Object> getChannelIdentifiers(Message<?> message) {
List<Object> channelList = new ArrayList<Object>();
String channelName = determineTargetChannelName(message);
if(channelName != null){
channelList.add(channelName);
}
return channelList;
}
/**
* Subclasses must implement this method to return the channel name.
*/
protected abstract String determineTargetChannelName(Message<?> message);
}

63
spring-integration-core/src/test/java/org/springframework/integration/router/RouterTests.java
View File

@@ -20,6 +20,7 @@ import static org.junit.Assert.assertEquals;
import static org.mockito.Mockito.mock;
import java.util.ArrayList;
import java.util.Collections;
import java.util.List;
import org.junit.Test;
@@ -90,7 +91,7 @@ public class RouterTests {
}
@Test
public void nullChannelNameArrayIgnoredByDefault() {
public void nullChannelIdentifierIgnoredByDefault() {
AbstractMessageRouter router = new AbstractMessageRouter() {
@Override
protected List<Object> getChannelIdentifiers(Message<?> message) {
@@ -103,8 +104,22 @@ public class RouterTests {
router.handleMessage(message);
}
@Test
public void nullChannelIdentifierInListIgnoredByDefault() {
AbstractMessageRouter router = new AbstractMessageRouter() {
@Override
protected List<Object> getChannelIdentifiers(Message<?> message) {
return Collections.singletonList(null);
}
};
TestChannelResolver channelResolver = new TestChannelResolver();
router.setChannelResolver(channelResolver);
Message<String> message = new GenericMessage<String>("test");
router.handleMessage(message);
}
@Test(expected = MessageDeliveryException.class)
public void nullChannelNameArrayThrowsExceptionWhenResolutionRequired() {
public void nullChannelIdentifierTriggersExceptionWhenResolutionRequired() {
AbstractMessageRouter router = new AbstractMessageRouter() {
protected List<Object> getChannelIdentifiers(Message<?> message) {
return null;
@@ -117,6 +132,19 @@ public class RouterTests {
router.handleMessage(message);
}
@Test(expected = MessageDeliveryException.class)
public void nullChannelIdentifierInListTriggersExceptionWhenResolutionRequired() {
AbstractMessageRouter router = new AbstractMessageRouter() {
protected List<Object> getChannelIdentifiers(Message<?> message) {
return Collections.singletonList(null);
}
};
TestChannelResolver channelResolver = new TestChannelResolver();
router.setChannelResolver(channelResolver);
router.setResolutionRequired(true);
Message<String> message = new GenericMessage<String>("test");
router.handleMessage(message);
}
@Test
public void emptyChannelNameArrayIgnoredByDefault() {
@@ -147,18 +175,7 @@ public class RouterTests {
}
@Test(expected = MessagingException.class)
public void channelMappingIsRequiredWhenResolvingChannelNamesWithSingleChannelRouter() {
AbstractSingleChannelNameRouter router = new AbstractSingleChannelNameRouter() {
public String determineTargetChannelName(Message<?> message) {
return "notImportant";
}
};
router.setBeanFactory(mock(BeanFactory.class));
router.handleMessage(new GenericMessage<String>("this should fail"));
}
@Test(expected = MessagingException.class)
public void channelMappingIsRequiredWhenResolvingChannelNamesWithMultiChannelRouter() {
public void channelMappingIsRequiredWhenResolvingChannelNames() {
AbstractMessageRouter router = new AbstractMessageRouter() {
@SuppressWarnings("unchecked")
protected List<Object> getChannelIdentifiers(Message<?> message){
@@ -170,23 +187,7 @@ public class RouterTests {
}
@Test
public void beanFactoryWithSingleChannelRouter() {
AbstractSingleChannelNameRouter router = new AbstractSingleChannelNameRouter() {
public String determineTargetChannelName(Message<?> message) {
return "testChannel";
}
};
QueueChannel testChannel = new QueueChannel();
GenericApplicationContext context = new GenericApplicationContext();
context.getBeanFactory().registerSingleton("testChannel", testChannel);
router.setBeanFactory(context);
router.handleMessage(new GenericMessage<String>("test"));
Message<?> reply = testChannel.receive(0);
assertEquals("test", reply.getPayload());
}
@Test
public void beanFactoryWithMultiChannelRouter() {
public void beanFactoryWithRouter() {
AbstractMessageRouter router = new AbstractMessageRouter() {
@SuppressWarnings("unchecked")
protected List<Object> getChannelIdentifiers(Message<?> message) {