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

Added namespace support for 'file-filter' and 'filename-filter' properties of FileSource (INT-242).

Browse Source
This commit is contained in:
Mark Fisher
2008-06-03 17:13:39 +00:00
parent 6334aedfe1
commit bfabc1a14b
7 changed files with 160 additions and 13 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
org.springframework.integration.adapter/src/main/java/org/springframework/integration/adapter/config/spring-integration-adapters-1.0.xsd
View File

@@ -27,6 +27,8 @@
<xsd:attribute name="directory" type="xsd:string" use="required"/>
<xsd:attribute name="type" type="fileSourceType" use="optional"/>
<xsd:attribute name="message-creator" type="xsd:string" use="optional"/>
<xsd:attribute name="file-filter" type="xsd:string"/>
<xsd:attribute name="filename-filter" type="xsd:string"/>
</xsd:complexType>
</xsd:element>

25
org.springframework.integration.adapter/src/main/java/org/springframework/integration/adapter/file/config/FileSourceParser.java
View File

@@ -19,7 +19,9 @@ package org.springframework.integration.adapter.file.config;
import org.w3c.dom.Element;
import org.springframework.beans.factory.support.BeanDefinitionBuilder;
import org.springframework.integration.ConfigurationException;
import org.springframework.integration.adapter.file.FileSource;
import org.springframework.util.StringUtils;
/**
* Parser for the &lt;file-source/&gt; element.
@@ -31,6 +33,10 @@ public class FileSourceParser extends AbstractDirectorySourceParser {
public static final String DIRECTORY_ATTRIBUTE = "directory";
public static final String FILE_FILTER_ATTRIBUTE = "file-filter";
public static final String FILENAME_FILTER_ATTRIBUTE = "filename-filter";
public FileSourceParser() {
super(false);
@@ -44,12 +50,27 @@ public class FileSourceParser extends AbstractDirectorySourceParser {
@Override
protected boolean isEligibleAttribute(String attributeName) {
return !DIRECTORY_ATTRIBUTE.equals(attributeName) && super.isEligibleAttribute(attributeName);
return !DIRECTORY_ATTRIBUTE.equals(attributeName) &&
!FILE_FILTER_ATTRIBUTE.equals(attributeName) &&
!FILENAME_FILTER_ATTRIBUTE.equals(attributeName) &&
super.isEligibleAttribute(attributeName);
}
@Override
protected void postProcess(BeanDefinitionBuilder beanDefinition, Element element) {
beanDefinition.addConstructorArgValue(element.getAttribute(DIRECTORY_ATTRIBUTE));
beanDefinition.addConstructorArgValue(element.getAttribute(DIRECTORY_ATTRIBUTE));
String fileFilter = element.getAttribute(FILE_FILTER_ATTRIBUTE);
String filenameFilter = element.getAttribute(FILENAME_FILTER_ATTRIBUTE);
if (StringUtils.hasText(fileFilter) && StringUtils.hasText(filenameFilter)) {
throw new ConfigurationException("FileSource does not support both '" +
FILE_FILTER_ATTRIBUTE + "' and '" + FILENAME_FILTER_ATTRIBUTE + "'.");
}
else if (StringUtils.hasText(fileFilter)) {
beanDefinition.addPropertyReference("fileFilter", fileFilter);
}
else if (StringUtils.hasText(filenameFilter)) {
beanDefinition.addPropertyReference("filenameFilter", filenameFilter);
}
super.postProcess(beanDefinition, element);
}