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

ChannelParser always uses 2-argument constructor now to avoid potential "related error" messages in the log following a NoSuchBeanDefinitionException.

Browse Source
This commit is contained in:
Mark Fisher
2008-01-22 21:18:14 +00:00
parent 095b889021
commit 104e8c3ddb
3 changed files with 8 additions and 8 deletions
Download Patch File Download Diff File Expand all files Collapse all files

3
spring-integration-core/src/main/java/org/springframework/integration/channel/SimpleChannel.java
View File

@@ -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;

11
spring-integration-core/src/main/java/org/springframework/integration/config/ChannelParser.java
View File

@@ -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;

2
spring-integration-core/src/main/java/org/springframework/integration/config/MessageBusParser.java
View File

@@ -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";