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

Minimizing class loading in parsers and using the parser context error handling capabilities rather than throwing Exceptions or using assertions. This facilitates proper tooling support (INT-114).

Browse Source
This commit is contained in:
Mark Fisher
2008-12-12 15:23:24 +00:00
parent ca8155ba5b
commit d75e1d9093
4 changed files with 184 additions and 19 deletions
Download Patch File Download Diff File Expand all files Collapse all files

46
org.springframework.integration.file/src/main/java/org/springframework/integration/file/config/FileInboundChannelAdapterParser.java
View File

@@ -16,19 +16,15 @@
package org.springframework.integration.file.config;
import java.util.regex.Pattern;
import org.w3c.dom.Element;
import org.springframework.beans.factory.config.BeanDefinition;
import org.springframework.beans.factory.config.RuntimeBeanReference;
import org.springframework.beans.factory.support.BeanDefinitionBuilder;
import org.springframework.beans.factory.support.BeanDefinitionReaderUtils;
import org.springframework.beans.factory.support.ManagedList;
import org.springframework.beans.factory.xml.ParserContext;
import org.springframework.integration.config.xml.AbstractPollingInboundChannelAdapterParser;
import org.springframework.integration.file.AcceptOnceFileListFilter;
import org.springframework.integration.file.CompositeFileListFilter;
import org.springframework.integration.file.PatternMatchingFileListFilter;
import org.springframework.integration.file.FileReadingMessageSource;
import org.springframework.util.Assert;
import org.springframework.util.StringUtils;
/**
@@ -39,9 +35,14 @@ import org.springframework.util.StringUtils;
*/
public class FileInboundChannelAdapterParser extends AbstractPollingInboundChannelAdapterParser {
private static final String PACKAGE_NAME = "org.springframework.integration.file";
@Override
@SuppressWarnings("unchecked")
protected String parseSource(Element element, ParserContext parserContext) {
BeanDefinitionBuilder builder = BeanDefinitionBuilder.genericBeanDefinition(FileReadingMessageSource.class);
BeanDefinitionBuilder builder = BeanDefinitionBuilder.genericBeanDefinition(
PACKAGE_NAME + ".FileReadingMessageSource");
String directory = element.getAttribute("directory");
if (StringUtils.hasText(directory)) {
builder.addPropertyValue("inputDirectory", directory);
@@ -52,15 +53,30 @@ public class FileInboundChannelAdapterParser extends AbstractPollingInboundChann
}
String filenamePattern = element.getAttribute("filename-pattern");
if (StringUtils.hasText(filenamePattern)) {
Assert.isTrue(!StringUtils.hasText(filter),
"at most one of 'filter' and 'filename-pattern' may be provided");
AcceptOnceFileListFilter acceptOnceFilter = new AcceptOnceFileListFilter();
Pattern pattern = Pattern.compile(filenamePattern);
PatternMatchingFileListFilter patternFilter = new PatternMatchingFileListFilter(pattern);
CompositeFileListFilter compositeFilter = new CompositeFileListFilter(acceptOnceFilter, patternFilter);
builder.addPropertyValue("filter", compositeFilter);
if (StringUtils.hasText(filter)) {
parserContext.getReaderContext().error(
"At most one of 'filter' and 'filename-pattern' may be provided.", element);
}
String acceptOnceFilterBeanName = this.parseFilter("AcceptOnceFileListFilter", null, parserContext);
String patternFilterBeanName = this.parseFilter("PatternMatchingFileListFilter", filenamePattern, parserContext);
ManagedList filters = new ManagedList();
filters.add(new RuntimeBeanReference(acceptOnceFilterBeanName));
filters.add(new RuntimeBeanReference(patternFilterBeanName));
String compositeFilterBeanName = this.parseFilter("CompositeFileListFilter", filters, parserContext);
builder.addPropertyReference("filter", compositeFilterBeanName);
}
return BeanDefinitionReaderUtils.registerWithGeneratedName(builder.getBeanDefinition(), parserContext.getRegistry());
}
private String parseFilter(String shortClassName, Object constructorArgValue, ParserContext parserContext) {
BeanDefinitionBuilder filterBuilder = BeanDefinitionBuilder.genericBeanDefinition(
PACKAGE_NAME + "." + shortClassName);
filterBuilder.getBeanDefinition().setRole(BeanDefinition.ROLE_SUPPORT);
if (constructorArgValue != null) {
filterBuilder.addConstructorArgValue(constructorArgValue);
}
return BeanDefinitionReaderUtils.registerWithGeneratedName(
filterBuilder.getBeanDefinition(), parserContext.getRegistry());
}
}

9
org.springframework.integration.file/src/main/java/org/springframework/integration/file/config/FileOutboundChannelAdapterParser.java
View File

@@ -22,8 +22,6 @@ import org.springframework.beans.factory.support.AbstractBeanDefinition;
import org.springframework.beans.factory.support.BeanDefinitionBuilder;
import org.springframework.beans.factory.xml.ParserContext;
import org.springframework.integration.config.xml.AbstractOutboundChannelAdapterParser;
import org.springframework.integration.file.FileWritingMessageHandler;
import org.springframework.util.Assert;
import org.springframework.util.StringUtils;
/**
@@ -36,8 +34,11 @@ public class FileOutboundChannelAdapterParser extends AbstractOutboundChannelAda
@Override
protected AbstractBeanDefinition parseConsumer(Element element, ParserContext parserContext) {
String directory = element.getAttribute("directory");
Assert.hasText(directory, "directory is required");
BeanDefinitionBuilder builder = BeanDefinitionBuilder.genericBeanDefinition(FileWritingMessageHandler.class);
if (!StringUtils.hasText(directory)) {
parserContext.getReaderContext().error("directory is required", element);
}
BeanDefinitionBuilder builder = BeanDefinitionBuilder.genericBeanDefinition(
"org.springframework.integration.file.FileWritingMessageHandler");
builder.addConstructorArgValue(directory);
String fileNameGenerator = element.getAttribute("filename-generator");
if (StringUtils.hasText(fileNameGenerator)) {