From 7cd64c5f49ff40bfbecde22377b30d72fa6e0c40 Mon Sep 17 00:00:00 2001 From: Artem Bilan Date: Fri, 20 Oct 2023 12:05:45 -0400 Subject: [PATCH] Fix SftpSupplier for explicit bean name With SF 6.0 we don't support `--debug` for method argument names anymore. We must use `@Qualifier` explicitly. Otherwise, it might be resolved to something else what matches the expected type. --- .../cloud/fn/supplier/sftp/SftpSupplierConfiguration.java | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) 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 31f82a32..9ff6450a 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 @@ -32,6 +32,7 @@ import reactor.util.context.Context; import org.springframework.aop.framework.ProxyFactoryBean; import org.springframework.aop.support.NameMatchMethodPointcutAdvisor; import org.springframework.beans.factory.BeanFactory; +import org.springframework.beans.factory.annotation.Qualifier; import org.springframework.boot.autoconfigure.condition.ConditionalOnExpression; import org.springframework.boot.autoconfigure.condition.ConditionalOnProperty; import org.springframework.boot.context.properties.EnableConfigurationProperties; @@ -255,7 +256,7 @@ public class SftpSupplierConfiguration { MonoProcessor subscriptionBarrier, SftpSupplierProperties sftpSupplierProperties, FileConsumerProperties fileConsumerProperties, - @Nullable MessageHandler renameRemoteFileHandler) { + @Nullable @Qualifier("renameRemoteFileHandler") MessageHandler renameRemoteFileHandler) { IntegrationFlowBuilder flowBuilder = FileUtils.enhanceFlowForReadingMode(IntegrationFlow .from(IntegrationReactiveUtils.messageSourceToFlux(sftpMessageSource)