Fix: Resolve duplicate webClientBuilder and restClientBuilder beans#13
Merged
Merged
Conversation
Rename bean methods and add explicit @ConditionalOnMissingBean type checks to prevent conflicts with Spring Boot's built-in RestClientAutoConfiguration and WebClientConfig from fireflyframework-core.
ancongui
approved these changes
Feb 13, 2026
ancongui
left a comment
Contributor
There was a problem hiding this comment.
LGTM. Two improvements here:
-
Explicit
@ConditionalOnMissingBeantype: Changing from bare@ConditionalOnMissingBean(which infers type from factory method return type) to explicit@ConditionalOnMissingBean(WebClient.Builder.class)/@ConditionalOnMissingBean(RestClientBuilder.class)makes the intent clear and avoids subtle inference issues. -
Bean method renames:
webClientBuilder→fireflyServiceWebClientBuilderandrestClientBuilder→fireflyRestClientBuilderdisambiguates from Spring Boot's own beans. Note this changes bean names, but since injection is typically by type (and the conditional checks by type), this is safe. Test plan confirms all 405 tests + 36 microservices pass.
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
Add this suggestion to a batch that can be applied as a single commit.This suggestion is invalid because no changes were made to the code.Suggestions cannot be applied while the pull request is closed.Suggestions cannot be applied while viewing a subset of changes.Only one suggestion per line can be applied in a batch.Add this suggestion to a batch that can be applied as a single commit.Applying suggestions on deleted lines is not supported.You must change the existing code in this line in order to create a valid suggestion.Outdated suggestions cannot be applied.This suggestion has been applied or marked resolved.Suggestions cannot be applied from pending reviews.Suggestions cannot be applied on multi-line comments.Suggestions cannot be applied while the pull request is queued to merge.Suggestion cannot be applied right now. Please check back later.
Summary
webClientBuilder()tofireflyServiceWebClientBuilder()with explicit@ConditionalOnMissingBean(WebClient.Builder.class)to prevent conflict withWebClientConfigin fireflyframework-corerestClientBuilder()tofireflyRestClientBuilder()with@ConditionalOnMissingBean(RestClientBuilder.class)to prevent conflict with Spring Boot'sRestClientAutoConfigurationTest plan