From 6abae5412bd06f9355df7320578c1617f00328d8 Mon Sep 17 00:00:00 2001 From: Mark Fisher Date: Fri, 5 Nov 2010 14:07:11 -0400 Subject: [PATCH] polishing --- .../AbstractFilePayloadTransformerParser.java | 2 +- .../FileInboundChannelAdapterParser.java | 119 ++++++----- .../config/FileListFilterFactoryBean.java | 163 ++++++++------- .../file/config/FileNamespaceHandler.java | 2 +- .../FileOutboundChannelAdapterParser.java | 2 +- .../config/FileOutboundGatewayParser.java | 2 +- .../FileReadingMessageSourceFactoryBean.java | 197 +++++++++--------- .../FileToByteArrayTransformerParser.java | 2 +- .../config/FileToStringTransformerParser.java | 2 +- ...ngMessageHandlerBeanDefinitionBuilder.java | 2 +- .../FileWritingMessageHandlerFactoryBean.java | 4 +- 11 files changed, 249 insertions(+), 248 deletions(-) diff --git a/spring-integration-file/src/main/java/org/springframework/integration/file/config/AbstractFilePayloadTransformerParser.java b/spring-integration-file/src/main/java/org/springframework/integration/file/config/AbstractFilePayloadTransformerParser.java index 2d495b7e08..74f9383589 100644 --- a/spring-integration-file/src/main/java/org/springframework/integration/file/config/AbstractFilePayloadTransformerParser.java +++ b/spring-integration-file/src/main/java/org/springframework/integration/file/config/AbstractFilePayloadTransformerParser.java @@ -1,5 +1,5 @@ /* - * Copyright 2002-2009 the original author or authors. + * Copyright 2002-2010 the original author or authors. * * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. diff --git a/spring-integration-file/src/main/java/org/springframework/integration/file/config/FileInboundChannelAdapterParser.java b/spring-integration-file/src/main/java/org/springframework/integration/file/config/FileInboundChannelAdapterParser.java index afef32cdc2..65e13c8311 100644 --- a/spring-integration-file/src/main/java/org/springframework/integration/file/config/FileInboundChannelAdapterParser.java +++ b/spring-integration-file/src/main/java/org/springframework/integration/file/config/FileInboundChannelAdapterParser.java @@ -1,5 +1,5 @@ /* - * Copyright 2002-2009 the original author or authors. + * Copyright 2002-2010 the original author or authors. * * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. @@ -31,73 +31,72 @@ import org.springframework.util.xml.DomUtils; /** * Parser for the <inbound-channel-adapter> element of the 'file' namespace. - * + * * @author Iwein Fuld * @author Mark Fisher */ public class FileInboundChannelAdapterParser extends AbstractPollingInboundChannelAdapterParser { - private static final String PACKAGE_NAME = "org.springframework.integration.file"; + private static final String PACKAGE_NAME = "org.springframework.integration.file"; - @Override - protected BeanMetadataElement parseSource(Element element, ParserContext parserContext) { - BeanDefinitionBuilder builder = BeanDefinitionBuilder.genericBeanDefinition( - PACKAGE_NAME + ".config.FileReadingMessageSourceFactoryBean"); - IntegrationNamespaceUtils.setReferenceIfAttributeDefined(builder, element, "comparator"); - IntegrationNamespaceUtils.setReferenceIfAttributeDefined(builder, element, "scanner"); - IntegrationNamespaceUtils.setValueIfAttributeDefined(builder, element, "directory"); - IntegrationNamespaceUtils.setValueIfAttributeDefined(builder, element, "auto-create-directory"); - IntegrationNamespaceUtils.setValueIfAttributeDefined(builder, element, "queue-size"); - String filterBeanName = this.registerFilter(element, parserContext); - String lockerBeanName = registerLocker(element, parserContext); - if (lockerBeanName != null) { - builder.addPropertyReference("locker", lockerBeanName); - } - builder.addPropertyReference("filter", filterBeanName); - String beanName = BeanDefinitionReaderUtils.registerWithGeneratedName(builder.getBeanDefinition(), parserContext.getRegistry()); - return new RuntimeBeanReference(beanName); - } + @Override + protected BeanMetadataElement parseSource(Element element, ParserContext parserContext) { + BeanDefinitionBuilder builder = BeanDefinitionBuilder.genericBeanDefinition( + PACKAGE_NAME + ".config.FileReadingMessageSourceFactoryBean"); + IntegrationNamespaceUtils.setReferenceIfAttributeDefined(builder, element, "comparator"); + IntegrationNamespaceUtils.setReferenceIfAttributeDefined(builder, element, "scanner"); + IntegrationNamespaceUtils.setValueIfAttributeDefined(builder, element, "directory"); + IntegrationNamespaceUtils.setValueIfAttributeDefined(builder, element, "auto-create-directory"); + IntegrationNamespaceUtils.setValueIfAttributeDefined(builder, element, "queue-size"); + String filterBeanName = this.registerFilter(element, parserContext); + String lockerBeanName = registerLocker(element, parserContext); + if (lockerBeanName != null) { + builder.addPropertyReference("locker", lockerBeanName); + } + builder.addPropertyReference("filter", filterBeanName); + String beanName = BeanDefinitionReaderUtils.registerWithGeneratedName( + builder.getBeanDefinition(), parserContext.getRegistry()); + return new RuntimeBeanReference(beanName); + } - private String registerLocker(Element element, ParserContext parserContext) { - String lockerBeanName = null; - Element nioLocker = DomUtils.getChildElementByTagName(element, "nio-locker"); - if (nioLocker != null) { - BeanDefinitionBuilder builder = BeanDefinitionBuilder - .genericBeanDefinition(PACKAGE_NAME + ".locking.NioFileLocker"); - lockerBeanName = BeanDefinitionReaderUtils.registerWithGeneratedName(builder.getBeanDefinition(), - parserContext.getRegistry()); - } else { - Element locker = DomUtils.getChildElementByTagName(element, "locker"); - if (locker != null) { - lockerBeanName = locker.getAttribute("ref"); - } - } - return lockerBeanName; - } + private String registerLocker(Element element, ParserContext parserContext) { + String lockerBeanName = null; + Element nioLocker = DomUtils.getChildElementByTagName(element, "nio-locker"); + if (nioLocker != null) { + BeanDefinitionBuilder builder = BeanDefinitionBuilder.genericBeanDefinition( + PACKAGE_NAME + ".locking.NioFileLocker"); + lockerBeanName = BeanDefinitionReaderUtils.registerWithGeneratedName( + builder.getBeanDefinition(), parserContext.getRegistry()); + } + else { + Element locker = DomUtils.getChildElementByTagName(element, "locker"); + if (locker != null) { + lockerBeanName = locker.getAttribute("ref"); + } + } + return lockerBeanName; + } - private String registerFilter(Element element, ParserContext parserContext) { - BeanDefinitionBuilder factoryBeanBuilder = BeanDefinitionBuilder.genericBeanDefinition( - PACKAGE_NAME + ".config.FileListFilterFactoryBean"); - factoryBeanBuilder.setRole(BeanDefinition.ROLE_SUPPORT); - String filter = element.getAttribute("filter"); - if (StringUtils.hasText(filter)) { - factoryBeanBuilder.addPropertyReference("filterReference", filter); - } - String filenamePattern = element.getAttribute("filename-pattern"); - if (StringUtils.hasText(filenamePattern)) { - if (StringUtils.hasText(filter)) { - parserContext.getReaderContext().error( - "At most one of 'filter' and 'filename-pattern' may be provided.", element); - } - factoryBeanBuilder.addPropertyValue("filenamePattern", filenamePattern); - } - String preventDuplicates = element.getAttribute("prevent-duplicates"); - if (StringUtils.hasText(preventDuplicates)) { - factoryBeanBuilder.addPropertyValue("preventDuplicates", preventDuplicates); - } - return BeanDefinitionReaderUtils.registerWithGeneratedName( - factoryBeanBuilder.getBeanDefinition(), parserContext.getRegistry()); - } + private String registerFilter(Element element, ParserContext parserContext) { + BeanDefinitionBuilder factoryBeanBuilder = BeanDefinitionBuilder.genericBeanDefinition( + PACKAGE_NAME + ".config.FileListFilterFactoryBean"); + factoryBeanBuilder.setRole(BeanDefinition.ROLE_SUPPORT); + String filter = element.getAttribute("filter"); + if (StringUtils.hasText(filter)) { + factoryBeanBuilder.addPropertyReference("filterReference", filter); + } + String filenamePattern = element.getAttribute("filename-pattern"); + if (StringUtils.hasText(filenamePattern)) { + if (StringUtils.hasText(filter)) { + parserContext.getReaderContext().error( + "At most one of 'filter' and 'filename-pattern' may be provided.", element); + } + factoryBeanBuilder.addPropertyValue("filenamePattern", filenamePattern); + } + IntegrationNamespaceUtils.setValueIfAttributeDefined(factoryBeanBuilder, element, "prevent-duplicates"); + return BeanDefinitionReaderUtils.registerWithGeneratedName( + factoryBeanBuilder.getBeanDefinition(), parserContext.getRegistry()); + } } diff --git a/spring-integration-file/src/main/java/org/springframework/integration/file/config/FileListFilterFactoryBean.java b/spring-integration-file/src/main/java/org/springframework/integration/file/config/FileListFilterFactoryBean.java index e0a0178462..ebb4b769bd 100644 --- a/spring-integration-file/src/main/java/org/springframework/integration/file/config/FileListFilterFactoryBean.java +++ b/spring-integration-file/src/main/java/org/springframework/integration/file/config/FileListFilterFactoryBean.java @@ -13,6 +13,7 @@ * See the License for the specific language governing permissions and * limitations under the License. */ + package org.springframework.integration.file.config; import org.springframework.beans.factory.FactoryBean; @@ -22,107 +23,111 @@ import org.springframework.integration.file.filters.SimplePatternFileListFilter; import java.io.File; import java.util.Collection; - /** * @author Mark Fisher * @since 1.0.3 */ public class FileListFilterFactoryBean implements FactoryBean> { - private volatile EntryListFilter fileListFilter; - private volatile EntryListFilter filterReference; - private volatile String filenamePattern; - private volatile Boolean preventDuplicates; - private final Object monitor = new Object(); - private volatile Collection> filterReferences; - private FileEntryNamer fileNamer = new FileEntryNamer(); - public void setFilterReferences(Collection> filterReferences) { - this.filterReferences = filterReferences; - } + private volatile EntryListFilter fileListFilter; - public void setFilterReference(EntryListFilter filterReference) { - this.filterReference = filterReference; - } + private volatile EntryListFilter filterReference; - public void setFilenamePattern(String filenamePattern) { - this.filenamePattern = filenamePattern; - } + private volatile String filenamePattern; - public void setPreventDuplicates(Boolean preventDuplicates) { - this.preventDuplicates = preventDuplicates; - } + private volatile Boolean preventDuplicates; - public EntryListFilter getObject() throws Exception { - if (this.fileListFilter == null) { - synchronized (this.monitor) { - this.intializeFileListFilter(); - } - } + private final Object monitor = new Object(); - return this.fileListFilter; - } + private volatile Collection> filterReferences; - public Class getObjectType() { - return (this.fileListFilter != null) ? this.fileListFilter.getClass() : EntryListFilter.class; - } - public boolean isSingleton() { - return true; - } + public void setFilterReferences(Collection> filterReferences) { + this.filterReferences = filterReferences; + } - private void intializeFileListFilter() { - if (this.fileListFilter != null) { - return; - } + public void setFilterReference(EntryListFilter filterReference) { + this.filterReference = filterReference; + } - EntryListFilter flf ; + public void setFilenamePattern(String filenamePattern) { + this.filenamePattern = filenamePattern; + } - if ((this.filterReference != null) && (this.filenamePattern != null)) { - throw new IllegalArgumentException("The 'filter' reference and " + "'filename-pattern' attributes are mutually exclusive."); - } + public void setPreventDuplicates(Boolean preventDuplicates) { + this.preventDuplicates = preventDuplicates; + } - if (this.filterReference != null) { - if (Boolean.TRUE.equals(this.preventDuplicates)) { - flf = this.createCompositeWithAcceptOnceFilter(this.filterReference); - } else { // preventDuplicates is either FALSE or NULL - flf = this.filterReference; - } - } else if (this.filenamePattern != null) { - SimplePatternFileListFilter patternFilter = new SimplePatternFileListFilter(this.filenamePattern); + public EntryListFilter getObject() throws Exception { + if (this.fileListFilter == null) { + synchronized (this.monitor) { + this.intializeFileListFilter(); + } + } + return this.fileListFilter; + } - if (Boolean.FALSE.equals(this.preventDuplicates)) { - flf = patternFilter; - } else { // preventDuplicates is either TRUE or NULL - flf = this.createCompositeWithAcceptOnceFilter(patternFilter); - } - } else if (Boolean.FALSE.equals(this.preventDuplicates)) { - flf = new AcceptAllEntryListFilter(); - } else { // preventDuplicates is either TRUE or NULL - flf = new AcceptOnceEntryFileListFilter(); - } + public Class getObjectType() { + return (this.fileListFilter != null) ? this.fileListFilter.getClass() : EntryListFilter.class; + } - // finally, it might be that they simply want a {@link CompositeEntryListFilter} - if ((this.filterReferences != null) && (this.filterReferences.size() > 0)) { - CompositeEntryListFilter flfc = new CompositeEntryListFilter(); + public boolean isSingleton() { + return true; + } - for (EntryListFilter ff : filterReferences) - flfc.addFilter(ff); + private void intializeFileListFilter() { + if (this.fileListFilter != null) { + return; + } + EntryListFilter filter; + if ((this.filterReference != null) && (this.filenamePattern != null)) { + throw new IllegalArgumentException("The 'filter' reference and " + + "'filename-pattern' attributes are mutually exclusive."); + } - flf = flfc; - } + if (this.filterReference != null) { + if (Boolean.TRUE.equals(this.preventDuplicates)) { + filter = this.createCompositeWithAcceptOnceFilter(this.filterReference); + } + else { // preventDuplicates is either FALSE or NULL + filter = this.filterReference; + } + } + else if (this.filenamePattern != null) { + SimplePatternFileListFilter patternFilter = new SimplePatternFileListFilter(this.filenamePattern); + if (Boolean.FALSE.equals(this.preventDuplicates)) { + filter = patternFilter; + } + else { // preventDuplicates is either TRUE or NULL + filter = this.createCompositeWithAcceptOnceFilter(patternFilter); + } + } + else if (Boolean.FALSE.equals(this.preventDuplicates)) { + filter = new AcceptAllEntryListFilter(); + } + else { // preventDuplicates is either TRUE or NULL + filter = new AcceptOnceEntryFileListFilter(); + } - if (flf == null) { - flf = new CompositeEntryListFilter(); - } + // finally, it might be that they simply want a {@link CompositeEntryListFilter} + if ((this.filterReferences != null) && (this.filterReferences.size() > 0)) { + CompositeEntryListFilter compositeFilter = new CompositeEntryListFilter(); + for (EntryListFilter ff : filterReferences) { + compositeFilter.addFilter(ff); + } + filter = compositeFilter; + } + if (filter == null) { + filter = new CompositeEntryListFilter(); + } + this.fileListFilter = filter; + } - this.fileListFilter = flf; - } + private CompositeEntryListFilter createCompositeWithAcceptOnceFilter(EntryListFilter otherFilter) { + CompositeEntryListFilter compositeFilter = new CompositeEntryListFilter(); + compositeFilter.addFilter(new AcceptOnceEntryFileListFilter()); + compositeFilter.addFilter(otherFilter); + return compositeFilter; + } - private CompositeEntryListFilter createCompositeWithAcceptOnceFilter(EntryListFilter otherFilter) { - CompositeEntryListFilter compositeFilter = new CompositeEntryListFilter(); - compositeFilter.addFilter(new AcceptOnceEntryFileListFilter()); - compositeFilter.addFilter(otherFilter); - - return compositeFilter; - } } diff --git a/spring-integration-file/src/main/java/org/springframework/integration/file/config/FileNamespaceHandler.java b/spring-integration-file/src/main/java/org/springframework/integration/file/config/FileNamespaceHandler.java index 259f948f56..8b86a87d92 100644 --- a/spring-integration-file/src/main/java/org/springframework/integration/file/config/FileNamespaceHandler.java +++ b/spring-integration-file/src/main/java/org/springframework/integration/file/config/FileNamespaceHandler.java @@ -1,5 +1,5 @@ /* - * Copyright 2002-2009 the original author or authors. + * Copyright 2002-2010 the original author or authors. * * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. diff --git a/spring-integration-file/src/main/java/org/springframework/integration/file/config/FileOutboundChannelAdapterParser.java b/spring-integration-file/src/main/java/org/springframework/integration/file/config/FileOutboundChannelAdapterParser.java index 5b7b529b11..0ec13d4e51 100644 --- a/spring-integration-file/src/main/java/org/springframework/integration/file/config/FileOutboundChannelAdapterParser.java +++ b/spring-integration-file/src/main/java/org/springframework/integration/file/config/FileOutboundChannelAdapterParser.java @@ -1,5 +1,5 @@ /* - * Copyright 2002-2009 the original author or authors. + * Copyright 2002-2010 the original author or authors. * * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. diff --git a/spring-integration-file/src/main/java/org/springframework/integration/file/config/FileOutboundGatewayParser.java b/spring-integration-file/src/main/java/org/springframework/integration/file/config/FileOutboundGatewayParser.java index b937007064..8c7fed7ac4 100644 --- a/spring-integration-file/src/main/java/org/springframework/integration/file/config/FileOutboundGatewayParser.java +++ b/spring-integration-file/src/main/java/org/springframework/integration/file/config/FileOutboundGatewayParser.java @@ -1,5 +1,5 @@ /* - * Copyright 2002-2009 the original author or authors. + * Copyright 2002-2010 the original author or authors. * * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. diff --git a/spring-integration-file/src/main/java/org/springframework/integration/file/config/FileReadingMessageSourceFactoryBean.java b/spring-integration-file/src/main/java/org/springframework/integration/file/config/FileReadingMessageSourceFactoryBean.java index 7a57605ac3..12ebf988e7 100644 --- a/spring-integration-file/src/main/java/org/springframework/integration/file/config/FileReadingMessageSourceFactoryBean.java +++ b/spring-integration-file/src/main/java/org/springframework/integration/file/config/FileReadingMessageSourceFactoryBean.java @@ -13,10 +13,12 @@ * See the License for the specific language governing permissions and * limitations under the License. */ + package org.springframework.integration.file.config; import org.apache.commons.logging.Log; import org.apache.commons.logging.LogFactory; + import org.springframework.beans.factory.FactoryBean; import org.springframework.integration.file.DirectoryScanner; import org.springframework.integration.file.FileReadingMessageSource; @@ -27,134 +29,129 @@ import org.springframework.integration.file.locking.AbstractFileLockerFilter; import java.io.File; import java.util.Comparator; - /** * @author Mark Fisher * @author Iwein Fuld * @since 1.0.3 */ public class FileReadingMessageSourceFactoryBean implements FactoryBean { - private static Log logger = LogFactory.getLog(FileReadingMessageSourceFactoryBean.class); - private volatile FileReadingMessageSource source; - private volatile File directory; - private volatile EntryListFilter filter; - private volatile AbstractFileLockerFilter locker; - private volatile Comparator comparator; - private volatile DirectoryScanner scanner; - private volatile Boolean scanEachPoll; - private volatile Boolean autoCreateDirectory; - private volatile Integer queueSize; - private final Object initializationMonitor = new Object(); - @SuppressWarnings("unused") - public void setDirectory(File directory) { - this.directory = directory; - } + private static Log logger = LogFactory.getLog(FileReadingMessageSourceFactoryBean.class); - @SuppressWarnings("unused") - public void setComparator(Comparator comparator) { - this.comparator = comparator; - } + private volatile FileReadingMessageSource source; - @SuppressWarnings("unused") - public void setScanner(DirectoryScanner scanner) { - this.scanner = scanner; - } + private volatile File directory; - @SuppressWarnings("unused") - public void setFilter(EntryListFilter filter) { - if (filter instanceof AbstractFileLockerFilter && (this.locker == null)) { - this.setLocker((AbstractFileLockerFilter) filter); - } + private volatile EntryListFilter filter; - this.filter = filter; - } + private volatile AbstractFileLockerFilter locker; - @SuppressWarnings("unused") - public void setScanEachPoll(Boolean scanEachPoll) { - this.scanEachPoll = scanEachPoll; - } + private volatile Comparator comparator; - @SuppressWarnings("unused") - public void setAutoCreateDirectory(Boolean autoCreateDirectory) { - this.autoCreateDirectory = autoCreateDirectory; - } + private volatile DirectoryScanner scanner; - @SuppressWarnings("unused") - public void setQueueSize(Integer queueSize) { - this.queueSize = queueSize; - } + private volatile Boolean scanEachPoll; - public void setLocker(AbstractFileLockerFilter locker) { - this.locker = locker; - } + private volatile Boolean autoCreateDirectory; - public FileReadingMessageSource getObject() throws Exception { - if (this.source == null) { - initSource(); - } + private volatile Integer queueSize; - return this.source; - } + private final Object initializationMonitor = new Object(); - public Class getObjectType() { - return FileReadingMessageSource.class; - } - public boolean isSingleton() { - return true; - } + public void setDirectory(File directory) { + this.directory = directory; + } - private void initSource() { - synchronized (this.initializationMonitor) { - if (this.source != null) { - return; - } + public void setComparator(Comparator comparator) { + this.comparator = comparator; + } - boolean comparatorSet = this.comparator != null; - boolean queueSizeSet = this.queueSize != null; + public void setScanner(DirectoryScanner scanner) { + this.scanner = scanner; + } - if (comparatorSet) { - if (queueSizeSet) { - logger.warn("'comparator' and 'queueSize' are mutually exclusive. Ignoring 'queueSize'"); - } + public void setFilter(EntryListFilter filter) { + if (filter instanceof AbstractFileLockerFilter && (this.locker == null)) { + this.setLocker((AbstractFileLockerFilter) filter); + } + this.filter = filter; + } - this.source = new FileReadingMessageSource(this.comparator); - } else if (queueSizeSet) { - this.source = new FileReadingMessageSource(queueSize); - } else { - this.source = new FileReadingMessageSource(); - } + public void setScanEachPoll(Boolean scanEachPoll) { + this.scanEachPoll = scanEachPoll; + } - this.source.setDirectory(this.directory); + public void setAutoCreateDirectory(Boolean autoCreateDirectory) { + this.autoCreateDirectory = autoCreateDirectory; + } - if (this.scanner != null) { - this.source.setScanner(this.scanner); - } + public void setQueueSize(Integer queueSize) { + this.queueSize = queueSize; + } - if (this.filter != null) { - if (this.locker == null) { - this.source.setFilter(this.filter); - } else { - CompositeEntryListFilter fileCompositeEntryListFilter = new CompositeEntryListFilter(); + public void setLocker(AbstractFileLockerFilter locker) { + this.locker = locker; + } + public FileReadingMessageSource getObject() throws Exception { + if (this.source == null) { + initSource(); + } + return this.source; + } + + public Class getObjectType() { + return FileReadingMessageSource.class; + } + + public boolean isSingleton() { + return true; + } + + private void initSource() { + synchronized (this.initializationMonitor) { + if (this.source != null) { + return; + } + boolean comparatorSet = this.comparator != null; + boolean queueSizeSet = this.queueSize != null; + if (comparatorSet) { + if (queueSizeSet) { + logger.warn("'comparator' and 'queueSize' are mutually exclusive. Ignoring 'queueSize'"); + } + this.source = new FileReadingMessageSource(this.comparator); + } + else if (queueSizeSet) { + this.source = new FileReadingMessageSource(queueSize); + } + else { + this.source = new FileReadingMessageSource(); + } + this.source.setDirectory(this.directory); + if (this.scanner != null) { + this.source.setScanner(this.scanner); + } + if (this.filter != null) { + if (this.locker == null) { + this.source.setFilter(this.filter); + } + else { + CompositeEntryListFilter fileCompositeEntryListFilter = new CompositeEntryListFilter(); fileCompositeEntryListFilter.addFilter(this.filter); fileCompositeEntryListFilter.addFilter(this.locker); + this.source.setFilter(fileCompositeEntryListFilter); + this.source.setLocker(locker); + } + } + if (this.scanEachPoll != null) { + this.source.setScanEachPoll(this.scanEachPoll); + } + if (this.autoCreateDirectory != null) { + this.source.setAutoCreateDirectory(this.autoCreateDirectory); + } + this.source.afterPropertiesSet(); + } + } - this.source.setFilter(fileCompositeEntryListFilter); - this.source.setLocker(locker); - } - } - - if (this.scanEachPoll != null) { - this.source.setScanEachPoll(this.scanEachPoll); - } - - if (this.autoCreateDirectory != null) { - this.source.setAutoCreateDirectory(this.autoCreateDirectory); - } - - this.source.afterPropertiesSet(); - } - } } diff --git a/spring-integration-file/src/main/java/org/springframework/integration/file/config/FileToByteArrayTransformerParser.java b/spring-integration-file/src/main/java/org/springframework/integration/file/config/FileToByteArrayTransformerParser.java index 7835e4744f..4821e3f170 100644 --- a/spring-integration-file/src/main/java/org/springframework/integration/file/config/FileToByteArrayTransformerParser.java +++ b/spring-integration-file/src/main/java/org/springframework/integration/file/config/FileToByteArrayTransformerParser.java @@ -1,5 +1,5 @@ /* - * Copyright 2002-2008 the original author or authors. + * Copyright 2002-2010 the original author or authors. * * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. diff --git a/spring-integration-file/src/main/java/org/springframework/integration/file/config/FileToStringTransformerParser.java b/spring-integration-file/src/main/java/org/springframework/integration/file/config/FileToStringTransformerParser.java index 0b382699c0..6e36b1d9d3 100644 --- a/spring-integration-file/src/main/java/org/springframework/integration/file/config/FileToStringTransformerParser.java +++ b/spring-integration-file/src/main/java/org/springframework/integration/file/config/FileToStringTransformerParser.java @@ -1,5 +1,5 @@ /* - * Copyright 2002-2008 the original author or authors. + * Copyright 2002-2010 the original author or authors. * * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. diff --git a/spring-integration-file/src/main/java/org/springframework/integration/file/config/FileWritingMessageHandlerBeanDefinitionBuilder.java b/spring-integration-file/src/main/java/org/springframework/integration/file/config/FileWritingMessageHandlerBeanDefinitionBuilder.java index fd6d6752da..f473c6c45f 100644 --- a/spring-integration-file/src/main/java/org/springframework/integration/file/config/FileWritingMessageHandlerBeanDefinitionBuilder.java +++ b/spring-integration-file/src/main/java/org/springframework/integration/file/config/FileWritingMessageHandlerBeanDefinitionBuilder.java @@ -1,5 +1,5 @@ /* - * Copyright 2002-2009 the original author or authors. + * Copyright 2002-2010 the original author or authors. * * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. diff --git a/spring-integration-file/src/main/java/org/springframework/integration/file/config/FileWritingMessageHandlerFactoryBean.java b/spring-integration-file/src/main/java/org/springframework/integration/file/config/FileWritingMessageHandlerFactoryBean.java index 73b23ecbf9..4256002349 100644 --- a/spring-integration-file/src/main/java/org/springframework/integration/file/config/FileWritingMessageHandlerFactoryBean.java +++ b/spring-integration-file/src/main/java/org/springframework/integration/file/config/FileWritingMessageHandlerFactoryBean.java @@ -32,8 +32,7 @@ import java.io.File; * @author Iwein Fuld * @since 1.0.3 */ -public class FileWritingMessageHandlerFactoryBean implements FactoryBean, - BeanFactoryAware { +public class FileWritingMessageHandlerFactoryBean implements FactoryBean, BeanFactoryAware { private volatile FileWritingMessageHandler handler; @@ -61,6 +60,7 @@ public class FileWritingMessageHandlerFactoryBean implements FactoryBean