Remove built-in ThreadLocalAccessor

The ThreadLocalAccessor in 1.0 was intended as a temporary solution
that is now replaced by a similar contract in the
`io.micrometer:context-propagation` library.

Unfortunately, there is no way to adapt one to the other, but
it is trivial to implement the new contract and register it either with
`ContextRegistry#getInstance` on startup or through the
`ServiceLoader` mechanism.

See gh-459

Author: rstoyanchev

spring-graphql/src/main/java/org/springframework/graphql/execution/CompositeThreadLocalAccessor.java

@@ -15,8 +15,6 @@
  */
 package org.springframework.graphql.execution;
 
-import java.util.Map;
-
 import io.micrometer.context.ThreadLocalAccessor;
 
 import org.springframework.security.core.context.SecurityContext;
@@ -33,9 +31,7 @@
  * @author Rossen Stoyanchev
  * @since 1.0.0
  */
-@SuppressWarnings("deprecation")
-public class SecurityContextThreadLocalAccessor implements ThreadLocalAccessor<Object>,
-		org.springframework.graphql.execution.ThreadLocalAccessor {
+public class SecurityContextThreadLocalAccessor implements ThreadLocalAccessor<Object> {
 
 	private final static boolean springSecurityPresent = ClassUtils.isPresent(
 			"org.springframework.security.core.context.SecurityContext",
@@ -81,27 +77,6 @@ public void reset() {
 	}
 
 
-	// Temporary implementation of deprecated ThreadLocalAccessor while it is still used
-	// in the Boot starter. If registered as such, it is ignored.
-
-	@Override
-	public void extractValues(Map<String, Object> container) {
-		container.put((String) key(), SecurityContextHolder.getContext());
-	}
-
-	@Override
-	public void restoreValues(Map<String, Object> values) {
-		if (values.containsKey((String) key())) {
-			SecurityContextHolder.setContext((SecurityContext) values.get((String) key()));
-		}
-	}
-
-	@Override
-	public void resetValues(Map<String, Object> values) {
-		SecurityContextHolder.clearContext();
-	}
-
-
 	private static class DelegateAccessor implements ThreadLocalAccessor<Object> {
 
 		@Override

spring-graphql/src/main/java/org/springframework/graphql/execution/SecurityContextThreadLocalAccessor.java

@@ -21,24 +21,19 @@
 import java.util.List;
 
 import io.micrometer.context.ContextSnapshot;
-
-import org.springframework.graphql.execution.SecurityContextThreadLocalAccessor;
-import org.springframework.graphql.execution.ThreadLocalAccessor;
 import reactor.core.publisher.Mono;
 
 import org.springframework.graphql.ExecutionGraphQlService;
 import org.springframework.graphql.server.WebGraphQlInterceptor.Chain;
 import org.springframework.lang.Nullable;
 import org.springframework.util.Assert;
-import org.springframework.util.CollectionUtils;
 
 
 /**
  * Default implementation of {@link WebGraphQlHandler.Builder}.
  *
  * @author Rossen Stoyanchev
  */
-@SuppressWarnings("deprecation")
 class DefaultWebGraphQlHandlerBuilder implements WebGraphQlHandler.Builder {
 
 	private final ExecutionGraphQlService service;
@@ -48,9 +43,6 @@ class DefaultWebGraphQlHandlerBuilder implements WebGraphQlHandler.Builder {
 	@Nullable
 	private WebSocketGraphQlInterceptor webSocketInterceptor;
 
-	@Nullable
-	private List<ThreadLocalAccessor> accessors;
-
 
 	DefaultWebGraphQlHandlerBuilder(ExecutionGraphQlService service) {
 		Assert.notNull(service, "GraphQlService is required");
@@ -75,30 +67,6 @@ public WebGraphQlHandler.Builder interceptors(List<WebGraphQlInterceptor> interc
 		return this;
 	}
 
-	@SuppressWarnings("deprecation")
-	@Override
-	public WebGraphQlHandler.Builder threadLocalAccessor(ThreadLocalAccessor... accessors) {
-		return threadLocalAccessors(Arrays.asList(accessors));
-	}
-
-	@SuppressWarnings("deprecation")
-	@Override
-	public WebGraphQlHandler.Builder threadLocalAccessors(List<ThreadLocalAccessor> accessors) {
-
-		// Filter out SecurityContextThreadLocalAccessor which is registered as a ThreadLocalAccessor
-		// from the micrometer-metrics/context-propagatation library. This code can be removed when
-		// SecurityContextThreadLocalAccessor no longer implements the deprecated ThreadLocalAccessor.
-		accessors = accessors.stream()
-				.filter(a -> !(a instanceof SecurityContextThreadLocalAccessor))
-				.toList();
-
-		if (!CollectionUtils.isEmpty(accessors)) {
-			this.accessors = (this.accessors != null) ? this.accessors : new ArrayList<>();
-			this.accessors.addAll(accessors);
-		}
-		return this;
-	}
-
 	@Override
 	public WebGraphQlHandler build() {
 
@@ -117,12 +85,6 @@ public WebSocketGraphQlInterceptor getWebSocketInterceptor() {
 						webSocketInterceptor : new WebSocketGraphQlInterceptor() {});
 			}
 
-			@Nullable
-			@Override
-			public ThreadLocalAccessor getThreadLocalAccessor() {
-				return (CollectionUtils.isEmpty(accessors) ? null : ThreadLocalAccessor.composite(accessors));
-			}
-
 			@Override
 			public Mono<WebGraphQlResponse> handleRequest(WebGraphQlRequest request) {
 				ContextSnapshot snapshot = ContextSnapshot.capture();

spring-graphql/src/main/java/org/springframework/graphql/execution/ThreadLocalAccessor.java

@@ -21,8 +21,6 @@
 import reactor.core.publisher.Mono;
 
 import org.springframework.graphql.ExecutionGraphQlService;
-import org.springframework.graphql.execution.ThreadLocalAccessor;
-import org.springframework.lang.Nullable;
 
 
 /**
@@ -41,15 +39,6 @@ public interface WebGraphQlHandler {
 	 */
 	WebSocketGraphQlInterceptor getWebSocketInterceptor();
 
-	/**
-	 * Return the composite {@link ThreadLocalAccessor} that the handler is
-	 * configured with.
-	 * @deprecated as of 1.1.0, together with {@link ThreadLocalAccessor}.
-	 */
-	@Deprecated
-	@Nullable
-	ThreadLocalAccessor getThreadLocalAccessor();
-
 	/**
 	 * Execute the given request and return the response.
 	 * @param request the request to execute
@@ -97,28 +86,6 @@ interface Builder {
 		 */
 		Builder interceptors(List<WebGraphQlInterceptor> interceptors);
 
-		/**
-		 * Configure accessors for ThreadLocal variables to use to extract
-		 * ThreadLocal values at the start of GraphQL execution in the web layer,
-		 * and have those saved, and restored around the invocation of data
-		 * fetchers and exception resolvers.
-		 * @param accessors the accessors to add
-		 * @return this builder
-		 * @deprecated as of 1.1.0 together with {@link ThreadLocalAccessor}.
-		 */
-		@Deprecated
-		Builder threadLocalAccessor(ThreadLocalAccessor... accessors);
-
-		/**
-		 * Alternative to {@link #threadLocalAccessor(ThreadLocalAccessor...)} with a
-		 * List.
-		 * @param accessors the list of accessors to add
-		 * @return this builder
-		 * @deprecated as of 1.1.0 together with {@link ThreadLocalAccessor}.
-		 */
-		@Deprecated
-		Builder threadLocalAccessors(List<ThreadLocalAccessor> accessors);
-
 		/**
 		 * Build the {@link WebGraphQlHandler} instance.
 		 * @return the built WebGraphQlHandler

spring-graphql/src/main/java/org/springframework/graphql/server/DefaultWebGraphQlHandlerBuilder.java

@@ -35,12 +35,10 @@
 import org.springframework.graphql.execution.GraphQlSource;
 import org.springframework.graphql.execution.RuntimeWiringConfigurer;
 import org.springframework.graphql.execution.SubscriptionExceptionResolver;
-import org.springframework.graphql.execution.ThreadLocalAccessor;
 import org.springframework.graphql.server.WebGraphQlHandler;
 import org.springframework.graphql.server.WebGraphQlInterceptor;
 import org.springframework.graphql.server.WebGraphQlSetup;
 import org.springframework.graphql.server.webflux.GraphQlHttpHandler;
-import org.springframework.lang.Nullable;
 
 /**
  * Workflow for GraphQL tests setup that starts with {@link GraphQlSource.Builder}
@@ -58,8 +56,6 @@ public class GraphQlSetup implements GraphQlServiceSetup {
 
 	private final List<WebGraphQlInterceptor> interceptors = new ArrayList<>();
 
-	private final List<ThreadLocalAccessor> accessors = new ArrayList<>();
-
 
 	private GraphQlSetup(Resource... schemaResources) {
 		this.graphQlSourceBuilder = GraphQlSource.schemaResourceBuilder().schemaResources(schemaResources);
@@ -147,19 +143,10 @@ public WebGraphQlSetup interceptor(WebGraphQlInterceptor... interceptors) {
 		return this;
 	}
 
-	@Override
-	public WebGraphQlSetup threadLocalAccessor(@Nullable ThreadLocalAccessor accessor) {
-		if (accessor != null) {
-			this.accessors.add(accessor);
-		}
-		return this;
-	}
-
 	public WebGraphQlHandler toWebGraphQlHandler() {
 		ExecutionGraphQlService service = toGraphQlService();
 		return WebGraphQlHandler.builder(service)
 				.interceptors(this.interceptors)
-				.threadLocalAccessors(this.accessors)
 				.build();
 	}
 

spring-graphql/src/main/java/org/springframework/graphql/server/WebGraphQlHandler.java

@@ -15,9 +15,7 @@
  */
 package org.springframework.graphql.server;
 
-import org.springframework.graphql.execution.ThreadLocalAccessor;
 import org.springframework.graphql.server.webflux.GraphQlHttpHandler;
-import org.springframework.lang.Nullable;
 
 /**
  * Workflow that results in the creation of a {@link WebGraphQlHandler} or
@@ -29,8 +27,6 @@ public interface WebGraphQlSetup {
 
 	WebGraphQlSetup interceptor(WebGraphQlInterceptor... interceptors);
 
-	WebGraphQlSetup threadLocalAccessor(@Nullable ThreadLocalAccessor accessor);
-
 	WebGraphQlHandler toWebGraphQlHandler();
 
 	org.springframework.graphql.server.webmvc.GraphQlHttpHandler toHttpHandler();