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

The 'channel' element now requires an 'id'.

Browse Source
This commit is contained in:
Mark Fisher
2008-01-22 00:52:07 +00:00
parent c9c9a0875c
commit 55283444da
5 changed files with 25 additions and 15 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -66,9 +66,6 @@ public class ChannelParser implements BeanDefinitionParser {
}
channelDef.getConstructorArgumentValues().addGenericArgumentValue(dispatcherPolicy);
String beanName = element.getAttribute(ID_ATTRIBUTE);
if (!StringUtils.hasText(beanName)) {
beanName = parserContext.getReaderContext().generateBeanName(channelDef);
}
parserContext.registerBeanComponent(new BeanComponentDefinition(channelDef, beanName));
return channelDef;
}

15
spring-integration-core/src/main/java/org/springframework/integration/config/spring-integration-1.0.xsd
View File

@@ -47,15 +47,12 @@
Defines a message channel.
</xsd:documentation>
</xsd:annotation>
<xsd:complexContent>
<xsd:extension base="beans:identifiedType">
<xsd:sequence>
<xsd:element ref="dispatcher-policy" minOccurs="0" maxOccurs="1"/>
</xsd:sequence>
<xsd:attribute name="capacity" type="xsd:integer"/>
<xsd:attribute name="publish-subscribe" type="xsd:boolean" default="false"/>
</xsd:extension>
</xsd:complexContent>
<xsd:sequence>
<xsd:element ref="dispatcher-policy" minOccurs="0" maxOccurs="1"/>
</xsd:sequence>
<xsd:attribute name="id" type="xsd:ID" use="required"/>
<xsd:attribute name="capacity" type="xsd:integer"/>
<xsd:attribute name="publish-subscribe" type="xsd:boolean" default="false"/>
</xsd:complexType>
</xsd:element>

4
spring-integration-core/src/main/java/org/springframework/integration/scheduling/MessagePublishingErrorHandler.java
View File

@@ -53,9 +53,7 @@ public class MessagePublishingErrorHandler implements ErrorHandler {
public void handle(Throwable t) {
if (this.errorChannel != null) {
try {
if(this.errorChannel.send(new ErrorMessage(t), this.sendTimeout)) {
return;
}
this.errorChannel.send(new ErrorMessage(t), this.sendTimeout);
}
catch (Throwable ignore) { // message will be logged only
}

6
spring-integration-core/src/test/java/org/springframework/integration/config/ChannelParserTests.java
View File

@@ -26,6 +26,7 @@ import java.util.concurrent.atomic.AtomicInteger;
import org.junit.Test;
import org.springframework.beans.FatalBeanException;
import org.springframework.context.support.ClassPathXmlApplicationContext;
import org.springframework.integration.channel.MessageChannel;
import org.springframework.integration.dispatcher.DefaultMessageDispatcher;
@@ -40,6 +41,11 @@ import org.springframework.integration.message.StringMessage;
*/
public class ChannelParserTests {
@Test(expected=FatalBeanException.class)
public void testChannelWithoutId() {
new ClassPathXmlApplicationContext("channelWithoutId.xml", this.getClass());
}
@Test
public void testChannelWithCapacity() {
ClassPathXmlApplicationContext context = new ClassPathXmlApplicationContext(

12
spring-integration-core/src/test/java/org/springframework/integration/config/channelWithoutId.xml Normal file
View File

@@ -0,0 +1,12 @@
<?xml version="1.0" encoding="UTF-8"?>
<beans xmlns="http://www.springframework.org/schema/beans"
xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
xmlns:integration="http://www.springframework.org/schema/integration"
xsi:schemaLocation="http://www.springframework.org/schema/beans
http://www.springframework.org/schema/beans/spring-beans-2.5.xsd
http://www.springframework.org/schema/integration
http://www.springframework.org/schema/integration/spring-integration-1.0.xsd">
<integration:channel/>
</beans>