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

GH-118: Fix auto-wire ambiguity in the HttpSupplierConfiguration

Browse Source 
Fixes: https://github.com/spring-cloud/spring-functions-catalog/issues/118

* Use `toReactivePublisher(true)` instead of manual lifecycle control for the `WebFluxInboundEndpoint`
This commit is contained in:
Artem Bilan
2024-12-19 13:38:17 -05:00
parent 9bc93a9371
commit 9b1754bdca
1 changed files with 4 additions and 9 deletions
Download Patch File Download Diff File Expand all files Collapse all files

13
supplier/spring-http-supplier/src/main/java/org/springframework/cloud/fn/supplier/http/HttpSupplierConfiguration.java
View File

@@ -68,23 +68,18 @@ public class HttpSupplierConfiguration {
.codecConfigurer(serverCodecConfigurer)
.crossOrigin((crossOrigin) -> crossOrigin.origin(httpSupplierProperties.getCors().getAllowedOrigins())
.allowedHeaders(httpSupplierProperties.getCors().getAllowedHeaders())
.allowCredentials(httpSupplierProperties.getCors().getAllowCredentials()))
.autoStartup(false))
.allowCredentials(httpSupplierProperties.getCors().getAllowCredentials())))
.enrichHeaders((headers) -> headers.headerFunction(MessageHeaders.CONTENT_TYPE,
(message) -> (MediaType.APPLICATION_FORM_URLENCODED
.equals(message.getHeaders().get(MessageHeaders.CONTENT_TYPE, MediaType.class)))
? MediaType.APPLICATION_JSON : null,
true))
.toReactivePublisher();
.toReactivePublisher(true);
}
@Bean
public Supplier<Flux<Message<byte[]>>> httpSupplier(Publisher<Message<byte[]>> httpRequestPublisher,
WebFluxInboundEndpoint webFluxInboundEndpoint) {
return () -> Flux.from(httpRequestPublisher)
.doOnSubscribe((subscription) -> webFluxInboundEndpoint.start())
.doOnTerminate(webFluxInboundEndpoint::stop);
public Supplier<Flux<Message<byte[]>>> httpSupplier(Publisher<Message<byte[]>> httpSupplierFlow) {
return () -> Flux.from(httpSupplierFlow);
}
}