fix: make autoconfiguration spring boot v3 compatible

Author: oliemansm

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

@@ -5,6 +5,7 @@
 import lombok.RequiredArgsConstructor;
 import lombok.extern.slf4j.Slf4j;
 import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.boot.autoconfigure.AutoConfiguration;
 import org.springframework.boot.autoconfigure.AutoConfigureAfter;
 import org.springframework.boot.autoconfigure.condition.ConditionalOnMissingBean;
 import org.springframework.boot.autoconfigure.jackson.JacksonAutoConfiguration;
@@ -13,18 +14,20 @@
 import org.springframework.boot.context.properties.EnableConfigurationProperties;
 import org.springframework.context.annotation.Bean;
 import org.springframework.context.annotation.ComponentScan;
-import org.springframework.context.annotation.Configuration;
 import org.springframework.security.oauth2.client.AuthorizedClientServiceReactiveOAuth2AuthorizedClientManager;
 import org.springframework.security.oauth2.client.InMemoryReactiveOAuth2AuthorizedClientService;
 import org.springframework.security.oauth2.client.registration.ReactiveClientRegistrationRepository;
 import org.springframework.security.oauth2.client.web.reactive.function.client.ServerOAuth2AuthorizedClientExchangeFilterFunction;
 import org.springframework.web.reactive.function.client.WebClient;
 
 @Slf4j
-@Configuration
+@AutoConfiguration
 @RequiredArgsConstructor
-@AutoConfigureAfter({JacksonAutoConfiguration.class, OAuth2ClientAutoConfiguration.class,
-    WebFluxAutoConfiguration.class})
+@AutoConfigureAfter({
+  JacksonAutoConfiguration.class,
+  OAuth2ClientAutoConfiguration.class,
+  WebFluxAutoConfiguration.class
+})
 @EnableConfigurationProperties(GraphQLClientProperties.class)
 @ComponentScan(basePackageClasses = GraphQLWebClientImpl.class)
 public class GraphQLWebClientAutoConfiguration {
@@ -34,9 +37,8 @@ public class GraphQLWebClientAutoConfiguration {
   @Bean
   @ConditionalOnMissingBean
   public WebClient webClient(
-      @SuppressWarnings("SpringJavaInjectionPointsAutowiringInspection") WebClient.Builder clientBuilder,
-      @Autowired(required = false) ReactiveClientRegistrationRepository clientRegistrations
-  ) {
+      WebClient.Builder clientBuilder,
+      @Autowired(required = false) ReactiveClientRegistrationRepository clientRegistrations) {
     clientBuilder.baseUrl(graphqlClientProperties.getUrl());
 
     if (isGraphQLClientRegistrationPresent(clientRegistrations)) {
@@ -52,8 +54,8 @@ private ServerOAuth2AuthorizedClientExchangeFilterFunction createOAuthFilter(
     InMemoryReactiveOAuth2AuthorizedClientService clientService =
         new InMemoryReactiveOAuth2AuthorizedClientService(clientRegistrations);
     AuthorizedClientServiceReactiveOAuth2AuthorizedClientManager authorizedClientManager =
-        new AuthorizedClientServiceReactiveOAuth2AuthorizedClientManager(clientRegistrations,
-            clientService);
+        new AuthorizedClientServiceReactiveOAuth2AuthorizedClientManager(
+            clientRegistrations, clientService);
     ServerOAuth2AuthorizedClientExchangeFilterFunction oauth =
         new ServerOAuth2AuthorizedClientExchangeFilterFunction(authorizedClientManager);
     oauth.setDefaultClientRegistrationId("graphql");
@@ -62,8 +64,8 @@ private ServerOAuth2AuthorizedClientExchangeFilterFunction createOAuthFilter(
 
   private boolean isGraphQLClientRegistrationPresent(
       ReactiveClientRegistrationRepository clientRegistrations) {
-    return clientRegistrations != null && clientRegistrations.findByRegistrationId("graphql")
-        .blockOptional().isPresent();
+    return clientRegistrations != null
+        && clientRegistrations.findByRegistrationId("graphql").blockOptional().isPresent();
   }
 
   @Bean
@@ -77,5 +79,4 @@ public ObjectMapper objectMapper() {
   public GraphQLWebClient graphQLWebClient(WebClient webClient, ObjectMapper objectMapper) {
     return new GraphQLWebClientImpl(webClient, objectMapper);
   }
-
 }

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

@@ -1,24 +1,25 @@
 package graphql.kickstart.spring.webclient.boot;
 
 import java.util.Arrays;
+import org.springframework.boot.autoconfigure.AutoConfiguration;
 import org.springframework.boot.autoconfigure.condition.ConditionalOnMissingBean;
 import org.springframework.boot.context.properties.EnableConfigurationProperties;
 import org.springframework.context.annotation.Bean;
-import org.springframework.context.annotation.Configuration;
 import org.springframework.security.oauth2.client.registration.InMemoryReactiveClientRegistrationRepository;
 import org.springframework.security.oauth2.client.registration.ReactiveClientRegistrationRepository;
 
-@Configuration
+@AutoConfiguration
 @EnableConfigurationProperties(OAuth2ClientRegistrationProperties.class)
 class OAuth2ClientRegistrationRepositoryConfiguration {
 
   @Bean
   @ConditionalOnMissingBean({ReactiveClientRegistrationRepository.class})
-  InMemoryReactiveClientRegistrationRepository clientRegistrationRepository(OAuth2ClientRegistrationProperties properties) {
-    return properties.getClientRegistration()
+  InMemoryReactiveClientRegistrationRepository clientRegistrationRepository(
+      OAuth2ClientRegistrationProperties properties) {
+    return properties
+        .getClientRegistration()
         .map(Arrays::asList)
         .map(InMemoryReactiveClientRegistrationRepository::new)
         .orElse(null);
   }
-
 }

graphql-webclient-spring-boot-autoconfigure/src/main/resources/META-INF/spring.factories renamed to graphql-webclient-spring-boot-autoconfigure/src/main/resources/META-INF/spring/org.springframework.boot.autoconfigure.AutoConfiguration.imports

@@ -1,3 +1,2 @@
-org.springframework.boot.autoconfigure.EnableAutoConfiguration=\
-graphql.kickstart.spring.webclient.boot.GraphQLWebClientAutoConfiguration,\
+graphql.kickstart.spring.webclient.boot.GraphQLWebClientAutoConfiguration
 graphql.kickstart.spring.webclient.boot.OAuth2ClientRegistrationRepositoryConfiguration