SpringCloud/spring-functions-catalog
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

GH-119: Fix auto-wiring ambiguity in the MailSupplierConfiguration

Browse Source 
Fixes: https://github.com/spring-cloud/spring-functions-catalog/issues/119
This commit is contained in:
Artem Bilan
2024-12-19 14:56:10 -05:00
parent eb644974f1
commit 6d4cb43c82
1 changed files with 10 additions and 14 deletions
Download Patch File Download Diff File Expand all files Collapse all files

24
supplier/spring-mail-supplier/src/main/java/org/springframework/cloud/fn/supplier/mail/MailSupplierConfiguration.java
View File

@@ -66,8 +66,8 @@ public class MailSupplierConfiguration {
}
@Bean
public Publisher<Message<Object>> mailInboundFlow(MessageProducerSupport messageProducer) {
return IntegrationFlow.from(messageProducer)
public Publisher<Message<Object>> mailInboundFlow(MessageProducerSupport mailChannelAdapter) {
return IntegrationFlow.from(mailChannelAdapter)
.transform(Mail.toStringTransformer(this.properties.getCharset()))
.enrichHeaders((h) -> h.defaultOverwrite(true)
.header(MailHeaders.TO, arrayToListProcessor(MailHeaders.TO))
@@ -76,12 +76,7 @@ public class MailSupplierConfiguration {
.toReactivePublisher(true);
}
@Bean
public Supplier<Flux<Message<?>>> mailSupplier(Publisher<Message<Object>> messagePublisher) {
return () -> Flux.from(messagePublisher);
}
private HeaderValueMessageProcessor<?> arrayToListProcessor(String header) {
private static HeaderValueMessageProcessor<?> arrayToListProcessor(String header) {
return new AbstractHeaderValueMessageProcessor<List<String>>() {
@Override
@@ -92,6 +87,11 @@ public class MailSupplierConfiguration {
};
}
@Bean
public Supplier<Flux<Message<?>>> mailSupplier(Publisher<Message<Object>> mailInboundFlow) {
return () -> Flux.from(mailInboundFlow);
}
@Bean("mailChannelAdapter")
@ConditionalOnProperty("mail.supplier.idle-imap")
MessageProducerSpec<?, ?> imapIdleProducer(
@@ -103,8 +103,7 @@ public class MailSupplierConfiguration {
.userFlag(this.properties.getUserFlag())
.javaMailProperties(getJavaMailProperties(urlName))
.selectorExpression(this.properties.getExpression())
.shouldMarkMessagesAsRead(this.properties.isMarkAsRead())
.autoStartup(false);
.shouldMarkMessagesAsRead(this.properties.isMarkAsRead());
if (imapIdleChannelAdapterSpecCustomizer != null) {
imapIdleChannelAdapterSpecCustomizer.customize(imapIdleChannelAdapterSpec);
@@ -139,10 +138,7 @@ public class MailSupplierConfiguration {
@Bean("mailChannelAdapter")
@ConditionalOnProperty(value = "mail.supplier.idle-imap", matchIfMissing = true, havingValue = "false")
MessageProducerSupport mailMessageProducer(MessageSource<?> mailMessageSource) {
ReactiveMessageSourceProducer reactiveMessageSourceProducer = new ReactiveMessageSourceProducer(
mailMessageSource);
reactiveMessageSourceProducer.setAutoStartup(false);
return reactiveMessageSourceProducer;
return new ReactiveMessageSourceProducer(mailMessageSource);
}
private Pop3MailInboundChannelAdapterSpec getPop3ChannelAdapterSpec(URLName urlName) {