diff --git a/supplier/spring-file-supplier/src/main/java/org/springframework/cloud/fn/supplier/file/FileSupplierConfiguration.java b/supplier/spring-file-supplier/src/main/java/org/springframework/cloud/fn/supplier/file/FileSupplierConfiguration.java index d926d58f..d44351b6 100644 --- a/supplier/spring-file-supplier/src/main/java/org/springframework/cloud/fn/supplier/file/FileSupplierConfiguration.java +++ b/supplier/spring-file-supplier/src/main/java/org/springframework/cloud/fn/supplier/file/FileSupplierConfiguration.java @@ -67,8 +67,6 @@ public class FileSupplierConfiguration { public Publisher> fileTailingFlow(FileSupplierProperties fileSupplierProperties) { FileSupplierProperties.Tailer tail = fileSupplierProperties.getTailer(); TailAdapterSpec tailAdapterSpec = Files.tailAdapter(fileSupplierProperties.getTail()) - // TODO until Spring Integration 6.2.3 - .autoStartup(false) .fileDelay(tail.getAttemptsDelay().toMillis()) // OS native tail command .nativeOptions(tail.getNativeOptions()) @@ -123,7 +121,7 @@ protected static class FileMessageSourceConfiguration { } @Bean - public ChainFileListFilter filter(ConcurrentMetadataStore metadataStore) { + public ChainFileListFilter fileListFilter(ConcurrentMetadataStore metadataStore) { ChainFileListFilter chainFilter = new ChainFileListFilter<>(); if (StringUtils.hasText(this.fileSupplierProperties.getFilenamePattern())) { chainFilter @@ -141,7 +139,7 @@ else if (this.fileSupplierProperties.getFilenameRegex() != null) { return chainFilter; } - @Bean + @Bean("fileReadingMessageSource") public FileInboundChannelAdapterSpec fileMessageSource(FileListFilter fileListFilter, @Nullable ComponentCustomizer fileInboundChannelAdapterSpecCustomizer) { diff --git a/supplier/spring-file-supplier/src/test/java/org/springframework/cloud/fn/supplier/file/DefaultFileSupplierTests.java b/supplier/spring-file-supplier/src/test/java/org/springframework/cloud/fn/supplier/file/DefaultFileSupplierTests.java index 67647331..63212baa 100644 --- a/supplier/spring-file-supplier/src/test/java/org/springframework/cloud/fn/supplier/file/DefaultFileSupplierTests.java +++ b/supplier/spring-file-supplier/src/test/java/org/springframework/cloud/fn/supplier/file/DefaultFileSupplierTests.java @@ -1,5 +1,5 @@ /* - * Copyright 2020-2022 the original author or authors. + * Copyright 2020-2024 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. @@ -47,7 +47,7 @@ public class DefaultFileSupplierTests extends AbstractFileSupplierTests { @Autowired - @Qualifier("fileMessageSource") + @Qualifier("fileReadingMessageSource") private FileReadingMessageSource fileMessageSource; @Autowired