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

Using Asserts with IllegalArgumentException/IllegalStateException instead of ConfigurationException.

Browse Source
This commit is contained in:
Mark Fisher
2008-09-29 15:06:27 +00:00
parent 6cda0b8e7c
commit 039679b173
4 changed files with 16 additions and 21 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -23,12 +23,12 @@ import org.w3c.dom.Element;
import org.springframework.beans.factory.support.BeanDefinitionBuilder;
import org.springframework.beans.factory.support.BeanDefinitionReaderUtils;
import org.springframework.beans.factory.xml.ParserContext;
import org.springframework.integration.ConfigurationException;
import org.springframework.integration.config.AbstractPollingInboundChannelAdapterParser;
import org.springframework.integration.file.AcceptOnceFileListFilter;
import org.springframework.integration.file.CompositeFileListFilter;
import org.springframework.integration.file.PatternMatchingFileListFilter;
import org.springframework.integration.file.PollableFileSource;
import org.springframework.util.Assert;
import org.springframework.util.StringUtils;
/**
@@ -52,9 +52,8 @@ public class FileInboundChannelAdapterParser extends AbstractPollingInboundChann
}
String filenamePattern = element.getAttribute("filename-pattern");
if (StringUtils.hasText(filenamePattern)) {
if (StringUtils.hasText(filter)) {
throw new ConfigurationException("at most one of 'filter' and 'filename-pattern' may be provided");
}
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);