From c06c571a2a8a14d43f9a0e35ede0d0d67a3c007b Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Carlos=20S=C3=A1nchez?= Date: Fri, 13 Feb 2026 17:00:05 +0100 Subject: [PATCH] Fix duplicate webClientBuilder and restClientBuilder bean registrations Rename bean methods and add explicit @ConditionalOnMissingBean type checks to prevent conflicts with Spring Boot's built-in RestClientAutoConfiguration and WebClientConfig from fireflyframework-core. --- .../config/ServiceClientAutoConfiguration.java | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/src/main/java/org/fireflyframework/config/ServiceClientAutoConfiguration.java b/src/main/java/org/fireflyframework/config/ServiceClientAutoConfiguration.java index 1643659..f0a8b76 100644 --- a/src/main/java/org/fireflyframework/config/ServiceClientAutoConfiguration.java +++ b/src/main/java/org/fireflyframework/config/ServiceClientAutoConfiguration.java @@ -70,8 +70,8 @@ public ServiceClientAutoConfiguration(ServiceClientProperties properties) { } @Bean - @ConditionalOnMissingBean - public WebClient.Builder webClientBuilder() { + @ConditionalOnMissingBean(WebClient.Builder.class) + public WebClient.Builder fireflyServiceWebClientBuilder() { log.info("Configuring enhanced WebClient builder for REST service clients"); ServiceClientProperties.Rest restConfig = properties.getRest(); @@ -158,8 +158,8 @@ public CircuitBreakerManager circuitBreakerManager(CircuitBreakerConfig config) * Creates a default REST client builder if none is provided. */ @Bean - @ConditionalOnMissingBean - public RestClientBuilder restClientBuilder(CircuitBreakerManager circuitBreakerManager) { + @ConditionalOnMissingBean(RestClientBuilder.class) + public RestClientBuilder fireflyRestClientBuilder(CircuitBreakerManager circuitBreakerManager) { log.info("Configuring default REST client builder with enhanced circuit breaker and retry"); var retryProps = properties.getRetry();