Skip to content

Fix: Resolve duplicate webClientBuilder and restClientBuilder beans #13

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
ancongui merged 1 commit into from
Feb 13, 2026
Merged

Fix: Resolve duplicate webClientBuilder and restClientBuilder beans #13

Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
8 changes: 4 additions & 4 deletions src/main/java/org/fireflyframework/config/ServiceClientAutoConfiguration.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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();
Expand Down Expand Up @@ -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();
Expand Down