Skip to content

Commit c0b5a85

Browse files
committed
Use webclient builder instance autoconfigured by SpringBoot
1 parent 60dbe63 commit c0b5a85

File tree

1 file changed

+7
-4
lines changed

1 file changed

+7
-4
lines changed

graphql-webclient-spring-boot-autoconfigure/src/main/java/graphql/kickstart/spring/webclient/boot/GraphQLWebClientAutoConfiguration.java

Lines changed: 7 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -8,6 +8,7 @@
88
import org.springframework.boot.autoconfigure.condition.ConditionalOnMissingBean;
99
import org.springframework.boot.autoconfigure.jackson.JacksonAutoConfiguration;
1010
import org.springframework.boot.autoconfigure.security.oauth2.client.servlet.OAuth2ClientAutoConfiguration;
11+
import org.springframework.boot.autoconfigure.web.reactive.WebFluxAutoConfiguration;
1112
import org.springframework.boot.context.properties.EnableConfigurationProperties;
1213
import org.springframework.context.annotation.Bean;
1314
import org.springframework.context.annotation.ComponentScan;
@@ -20,7 +21,7 @@
2021
@Slf4j
2122
@Configuration
2223
@RequiredArgsConstructor
23-
@AutoConfigureAfter({JacksonAutoConfiguration.class, OAuth2ClientAutoConfiguration.class})
24+
@AutoConfigureAfter({JacksonAutoConfiguration.class, OAuth2ClientAutoConfiguration.class, WebFluxAutoConfiguration.class})
2425
@EnableConfigurationProperties(GraphQLClientProperties.class)
2526
@ComponentScan(basePackageClasses = GraphQLWebClientImpl.class)
2627
public class GraphQLWebClientAutoConfiguration {
@@ -29,9 +30,11 @@ public class GraphQLWebClientAutoConfiguration {
2930

3031
@Bean
3132
@ConditionalOnMissingBean
32-
public WebClient webClient(@Autowired(required = false) ReactiveClientRegistrationRepository clientRegistrations) {
33-
WebClient.Builder clientBuilder = WebClient.builder()
34-
.baseUrl(graphqlClientProperties.getUrl());
33+
public WebClient webClient(
34+
WebClient.Builder clientBuilder,
35+
@Autowired(required = false) ReactiveClientRegistrationRepository clientRegistrations
36+
) {
37+
clientBuilder.baseUrl(graphqlClientProperties.getUrl());
3538

3639
if (clientRegistrations != null && clientRegistrations.findByRegistrationId("graphql").blockOptional().isPresent()) {
3740
ServerOAuth2AuthorizedClientExchangeFilterFunction oauth =

0 commit comments

Comments
 (0)