From edfe13e7454ba223c2df4af58dbb558d466670af Mon Sep 17 00:00:00 2001 From: David Turanski Date: Wed, 19 Aug 2020 12:37:15 -0400 Subject: [PATCH] Fix no factory bean warnings --- .../ftp/FtpSupplierConfiguration.java | 6 +++--- .../fn/supplier/ftp/FtpSupplierTests.java | 1 - .../sftp/SftpSupplierConfiguration.java | 19 ++++++++++--------- 3 files changed, 13 insertions(+), 13 deletions(-) diff --git a/supplier/ftp-supplier/src/main/java/org/springframework/cloud/fn/supplier/ftp/FtpSupplierConfiguration.java b/supplier/ftp-supplier/src/main/java/org/springframework/cloud/fn/supplier/ftp/FtpSupplierConfiguration.java index 18dc7a28..a361f597 100644 --- a/supplier/ftp-supplier/src/main/java/org/springframework/cloud/fn/supplier/ftp/FtpSupplierConfiguration.java +++ b/supplier/ftp-supplier/src/main/java/org/springframework/cloud/fn/supplier/ftp/FtpSupplierConfiguration.java @@ -88,7 +88,7 @@ public class FtpSupplierConfiguration { } @Bean - public MessageSource ftpMessageSource() { + public FtpInboundChannelAdapterSpec ftpMessageSource() { FtpInboundChannelAdapterSpec messageSourceBuilder = Ftp.inboundAdapter(ftpSessionFactory) .preserveTimestamp(this.ftpSupplierProperties.isPreserveTimestamp()) .remoteDirectory(this.ftpSupplierProperties.getRemoteDir()) @@ -110,7 +110,7 @@ public class FtpSupplierConfiguration { chainFileListFilter.addFilter(new FtpPersistentAcceptOnceFileListFilter(this.metadataStore, "ftpSource/")); messageSourceBuilder.filter(chainFileListFilter); - return messageSourceBuilder.get(); + return messageSourceBuilder; } @Bean @@ -127,7 +127,7 @@ public class FtpSupplierConfiguration { @ConditionalOnExpression("environment['file.consumer.mode'] != 'ref'") public Publisher> ftpReadingFlow() { return FileUtils.enhanceFlowForReadingMode(IntegrationFlows - .from(IntegrationReactiveUtils.messageSourceToFlux(ftpMessageSource())), fileConsumerProperties) + .from(IntegrationReactiveUtils.messageSourceToFlux(ftpMessageSource().get())), fileConsumerProperties) .toReactivePublisher(); } diff --git a/supplier/ftp-supplier/src/test/java/org/springframework/cloud/fn/supplier/ftp/FtpSupplierTests.java b/supplier/ftp-supplier/src/test/java/org/springframework/cloud/fn/supplier/ftp/FtpSupplierTests.java index 4fd2c480..e74e8bf8 100644 --- a/supplier/ftp-supplier/src/test/java/org/springframework/cloud/fn/supplier/ftp/FtpSupplierTests.java +++ b/supplier/ftp-supplier/src/test/java/org/springframework/cloud/fn/supplier/ftp/FtpSupplierTests.java @@ -40,7 +40,6 @@ import static org.assertj.core.api.Assertions.assertThat; @SpringBootTest(webEnvironment = SpringBootTest.WebEnvironment.NONE, properties = { - "debug=true", "ftp.factory.username = foo", "ftp.factory.password = foo", "file.consumer.mode = ref", diff --git a/supplier/sftp-supplier/src/main/java/org/springframework/cloud/fn/supplier/sftp/SftpSupplierConfiguration.java b/supplier/sftp-supplier/src/main/java/org/springframework/cloud/fn/supplier/sftp/SftpSupplierConfiguration.java index f8342c85..a9242a38 100644 --- a/supplier/sftp-supplier/src/main/java/org/springframework/cloud/fn/supplier/sftp/SftpSupplierConfiguration.java +++ b/supplier/sftp-supplier/src/main/java/org/springframework/cloud/fn/supplier/sftp/SftpSupplierConfiguration.java @@ -54,6 +54,7 @@ import org.springframework.integration.file.remote.session.SessionFactory; import org.springframework.integration.handler.MessageProcessor; import org.springframework.integration.metadata.ConcurrentMetadataStore; import org.springframework.integration.sftp.dsl.Sftp; +import org.springframework.integration.sftp.dsl.SftpInboundChannelAdapterSpec; import org.springframework.integration.sftp.filters.SftpPersistentAcceptOnceFileListFilter; import org.springframework.integration.sftp.filters.SftpRegexPatternFileListFilter; import org.springframework.integration.sftp.session.SftpRemoteFileTemplate; @@ -79,8 +80,8 @@ import org.springframework.util.StringUtils; */ @Configuration -@EnableConfigurationProperties({SftpSupplierProperties.class, FileConsumerProperties.class}) -@Import({SftpSupplierFactoryConfiguration.class}) +@EnableConfigurationProperties({ SftpSupplierProperties.class, FileConsumerProperties.class }) +@Import({ SftpSupplierFactoryConfiguration.class }) @SuppressWarnings("SpringJavaInjectionPointsAutowiringInspection") public class SftpSupplierConfiguration { @@ -199,10 +200,10 @@ public class SftpSupplierConfiguration { FileConsumerProperties fileConsumerProperties) { return FileUtils.enhanceStreamFlowForReadingMode(IntegrationFlows - .from(IntegrationReactiveUtils.messageSourceToFlux(sftpMessageSource) - .subscriberContext( - context -> (context.put(IntegrationReactiveUtils.DELAY_WHEN_EMPTY_KEY, - sftpSupplierProperties.getDelayWhenEmpty())))), + .from(IntegrationReactiveUtils.messageSourceToFlux(sftpMessageSource) + .subscriberContext( + context -> (context.put(IntegrationReactiveUtils.DELAY_WHEN_EMPTY_KEY, + sftpSupplierProperties.getDelayWhenEmpty())))), fileConsumerProperties) .toReactivePublisher(); } @@ -234,7 +235,7 @@ public class SftpSupplierConfiguration { FileConsumerProperties fileConsumerProperties) { return FileUtils.enhanceFlowForReadingMode(IntegrationFlows - .from(IntegrationReactiveUtils.messageSourceToFlux(sftpMessageSource)), + .from(IntegrationReactiveUtils.messageSourceToFlux(sftpMessageSource)), fileConsumerProperties) .toReactivePublisher(); } @@ -245,7 +246,7 @@ public class SftpSupplierConfiguration { */ @ConditionalOnExpression("environment['sftp.supplier.list-only'] != 'true'") @Bean - public MessageSource targetMessageSource(SftpSupplierProperties sftpSupplierProperties, + public SftpInboundChannelAdapterSpec targetMessageSource(SftpSupplierProperties sftpSupplierProperties, SftpSupplierFactoryConfiguration.DelegatingFactoryWrapper delegatingFactoryWrapper, FileListFilter fileListFilter) { @@ -260,7 +261,7 @@ public class SftpSupplierConfiguration { .temporaryFileSuffix(sftpSupplierProperties.getTmpFileSuffix()) .metadataStorePrefix(METADATA_STORE_PREFIX) .maxFetchSize(sftpSupplierProperties.getMaxFetch()) - .filter(fileListFilter).get(); + .filter(fileListFilter); } }