From 104e8c3ddb27da36f6d64a0dca3f08d92819cd6d Mon Sep 17 00:00:00 2001 From: Mark Fisher Date: Tue, 22 Jan 2008 21:18:14 +0000 Subject: [PATCH] ChannelParser always uses 2-argument constructor now to avoid potential "related error" messages in the log following a NoSuchBeanDefinitionException. --- .../integration/channel/SimpleChannel.java | 3 ++- .../integration/config/ChannelParser.java | 11 +++++------ .../integration/config/MessageBusParser.java | 2 +- 3 files changed, 8 insertions(+), 8 deletions(-) diff --git a/spring-integration-core/src/main/java/org/springframework/integration/channel/SimpleChannel.java b/spring-integration-core/src/main/java/org/springframework/integration/channel/SimpleChannel.java index 159cba39c0..64f6665b01 100644 --- a/spring-integration-core/src/main/java/org/springframework/integration/channel/SimpleChannel.java +++ b/spring-integration-core/src/main/java/org/springframework/integration/channel/SimpleChannel.java @@ -34,7 +34,8 @@ import org.springframework.util.Assert; */ public class SimpleChannel implements MessageChannel, BeanNameAware { - private static final int DEFAULT_CAPACITY = 100; + public static final int DEFAULT_CAPACITY = 100; + private String name; diff --git a/spring-integration-core/src/main/java/org/springframework/integration/config/ChannelParser.java b/spring-integration-core/src/main/java/org/springframework/integration/config/ChannelParser.java index c393e667dc..800ff0d7bd 100644 --- a/spring-integration-core/src/main/java/org/springframework/integration/config/ChannelParser.java +++ b/spring-integration-core/src/main/java/org/springframework/integration/config/ChannelParser.java @@ -48,10 +48,6 @@ public class ChannelParser implements BeanDefinitionParser { public BeanDefinition parse(Element element, ParserContext parserContext) { RootBeanDefinition channelDef = new RootBeanDefinition(SimpleChannel.class); channelDef.setSource(parserContext.extractSource(element)); - String capacity = element.getAttribute(CAPACITY_ATTRIBUTE); - if (StringUtils.hasText(capacity)) { - channelDef.getConstructorArgumentValues().addGenericArgumentValue(Integer.parseInt(capacity)); - } boolean isPublishSubscribe = "true".equals(element.getAttribute(PUBLISH_SUBSCRIBE_ATTRIBUTE)); DispatcherPolicy dispatcherPolicy = new DispatcherPolicy(isPublishSubscribe); NodeList childNodes = element.getChildNodes(); @@ -63,8 +59,11 @@ public class ChannelParser implements BeanDefinitionParser { configureDispatcherPolicy((Element) child, dispatcherPolicy); } } - } - channelDef.getConstructorArgumentValues().addGenericArgumentValue(dispatcherPolicy); + } + String capAttr = element.getAttribute(CAPACITY_ATTRIBUTE); + int capacity = (StringUtils.hasText(capAttr)) ? Integer.parseInt(capAttr) : SimpleChannel.DEFAULT_CAPACITY; + channelDef.getConstructorArgumentValues().addIndexedArgumentValue(0, capacity); + channelDef.getConstructorArgumentValues().addIndexedArgumentValue(1, dispatcherPolicy); String beanName = element.getAttribute(ID_ATTRIBUTE); parserContext.registerBeanComponent(new BeanComponentDefinition(channelDef, beanName)); return channelDef; diff --git a/spring-integration-core/src/main/java/org/springframework/integration/config/MessageBusParser.java b/spring-integration-core/src/main/java/org/springframework/integration/config/MessageBusParser.java index 08ee4b895d..4e3038ba07 100644 --- a/spring-integration-core/src/main/java/org/springframework/integration/config/MessageBusParser.java +++ b/spring-integration-core/src/main/java/org/springframework/integration/config/MessageBusParser.java @@ -34,7 +34,7 @@ import org.springframework.util.StringUtils; */ public class MessageBusParser extends AbstractSimpleBeanDefinitionParser { - public static final String MESSAGE_BUS_BEAN_NAME = "org.springframework.integration.bus.internalMessageBus"; + public static final String MESSAGE_BUS_BEAN_NAME = "internal.MessageBus"; private static final String ERROR_CHANNEL_ATTRIBUTE = "error-channel";