Replace deprecated code fix #17

Author: oliemansm

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

@@ -1,6 +1,7 @@
 package graphql.kickstart.spring.webclient.boot;
 
 import com.fasterxml.jackson.databind.ObjectMapper;
+import lombok.NonNull;
 import lombok.RequiredArgsConstructor;
 import lombok.extern.slf4j.Slf4j;
 import org.springframework.beans.factory.annotation.Autowired;
@@ -13,15 +14,17 @@
 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.security.oauth2.client.web.server.UnAuthenticatedServerOAuth2AuthorizedClientRepository;
 import org.springframework.web.reactive.function.client.WebClient;
 
 @Slf4j
 @Configuration
 @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 {
@@ -36,18 +39,33 @@ public WebClient webClient(
   ) {
     clientBuilder.baseUrl(graphqlClientProperties.getUrl());
 
-    if (clientRegistrations != null && clientRegistrations.findByRegistrationId("graphql").blockOptional().isPresent()) {
-      ServerOAuth2AuthorizedClientExchangeFilterFunction oauth =
-          new ServerOAuth2AuthorizedClientExchangeFilterFunction(
-              clientRegistrations,
-              new UnAuthenticatedServerOAuth2AuthorizedClientRepository());
-      oauth.setDefaultClientRegistrationId("graphql");
-      clientBuilder.filter(oauth);
+    if (isGraphQLClientRegistrationPresent(clientRegistrations)) {
+      clientBuilder.filter(createOAuthFilter(clientRegistrations));
     }
 
     return clientBuilder.build();
   }
 
+  @NonNull
+  private ServerOAuth2AuthorizedClientExchangeFilterFunction createOAuthFilter(
+      ReactiveClientRegistrationRepository clientRegistrations) {
+    InMemoryReactiveOAuth2AuthorizedClientService clientService =
+        new InMemoryReactiveOAuth2AuthorizedClientService(clientRegistrations);
+    AuthorizedClientServiceReactiveOAuth2AuthorizedClientManager authorizedClientManager =
+        new AuthorizedClientServiceReactiveOAuth2AuthorizedClientManager(clientRegistrations,
+            clientService);
+    ServerOAuth2AuthorizedClientExchangeFilterFunction oauth =
+        new ServerOAuth2AuthorizedClientExchangeFilterFunction(authorizedClientManager);
+    oauth.setDefaultClientRegistrationId("graphql");
+    return oauth;
+  }
+
+  private boolean isGraphQLClientRegistrationPresent(
+      ReactiveClientRegistrationRepository clientRegistrations) {
+    return clientRegistrations != null && clientRegistrations.findByRegistrationId("graphql")
+        .blockOptional().isPresent();
+  }
+
   @Bean
   @ConditionalOnMissingBean
   public ObjectMapper objectMapper() {

graphql-webclient/src/main/java/graphql/kickstart/spring/webclient/boot/GraphQLError.java

@@ -10,6 +10,6 @@ public class GraphQLError {
   private String message;
   private List<Location> locations;
   private List<String> path;
-  private Map<String, Object> extensions  ;
+  private Map<String, Object> extensions;
 
 }

graphql-webclient/src/main/java/graphql/kickstart/spring/webclient/boot/GraphQLErrorsException.java

@@ -10,7 +10,7 @@
 @RequiredArgsConstructor
 public class GraphQLErrorsException extends RuntimeException {
 
-  List<GraphQLError> errors;
+  transient List<GraphQLError> errors;
 
   @Override
   public String getMessage() {