fix(deps): update graphql-java to v20.0.0

gradle.properties

@@ -7,7 +7,7 @@ PROJECT_LICENSE=MIT
 PROJECT_LICENSE_URL=https://github.com/graphql-java-kickstart/spring-java-servlet/blob/master/LICENSE.md
 PROJECT_DEV_ID=oliemansm
 PROJECT_DEV_NAME=Michiel Oliemans
-LIB_GRAPHQL_JAVA_VER=19.3
+LIB_GRAPHQL_JAVA_VER=20.0
 LIB_JACKSON_VER=2.14.2
 LIB_SLF4J_VER=2.0.6
 LIB_LOMBOK_VER=1.18.26

graphql-java-kickstart/src/main/java/graphql/kickstart/execution/GraphQLQueryInvoker.java

@@ -2,7 +2,7 @@
 
 import graphql.execution.instrumentation.ChainedInstrumentation;
 import graphql.execution.instrumentation.Instrumentation;
-import graphql.execution.instrumentation.SimpleInstrumentation;
+import graphql.execution.instrumentation.SimplePerformantInstrumentation;
 import graphql.execution.instrumentation.dataloader.DataLoaderDispatcherInstrumentationOptions;
 import graphql.execution.preparsed.NoOpPreparsedDocumentProvider;
 import graphql.execution.preparsed.PreparsedDocumentProvider;
@@ -12,7 +12,9 @@
 import java.util.List;
 import java.util.function.Supplier;
 
-/** @author Andrew Potter */
+/**
+ * @author Andrew Potter
+ */
 public class GraphQLQueryInvoker {
 
   private final Supplier<ExecutionStrategyProvider> getExecutionStrategyProvider;
@@ -48,7 +50,8 @@ public static class Builder {
 
     private Supplier<ExecutionStrategyProvider> getExecutionStrategyProvider =
         DefaultExecutionStrategyProvider::new;
-    private Supplier<Instrumentation> getInstrumentation = () -> SimpleInstrumentation.INSTANCE;
+    private Supplier<Instrumentation> getInstrumentation =
+        () -> SimplePerformantInstrumentation.INSTANCE;
     private Supplier<PreparsedDocumentProvider> getPreparsedDocumentProvider =
         () -> NoOpPreparsedDocumentProvider.INSTANCE;
     private Supplier<DataLoaderDispatcherInstrumentationOptions>

graphql-java-kickstart/src/main/java/graphql/kickstart/execution/config/GraphQLBuilder.java

@@ -4,7 +4,7 @@
 import graphql.execution.ExecutionStrategy;
 import graphql.execution.instrumentation.ChainedInstrumentation;
 import graphql.execution.instrumentation.Instrumentation;
-import graphql.execution.instrumentation.SimpleInstrumentation;
+import graphql.execution.instrumentation.SimplePerformantInstrumentation;
 import graphql.execution.instrumentation.dataloader.DataLoaderDispatcherInstrumentation;
 import graphql.execution.preparsed.NoOpPreparsedDocumentProvider;
 import graphql.execution.preparsed.PreparsedDocumentProvider;
@@ -20,7 +20,8 @@ public class GraphQLBuilder {
       () -> NoOpPreparsedDocumentProvider.INSTANCE;
 
   @Getter
-  private Supplier<Instrumentation> instrumentationSupplier = () -> SimpleInstrumentation.INSTANCE;
+  private Supplier<Instrumentation> instrumentationSupplier =
+      () -> SimplePerformantInstrumentation.INSTANCE;
 
   private Supplier<GraphQLBuilderConfigurer> graphQLBuilderConfigurerSupplier = () -> builder -> {};
 

graphql-java-kickstart/src/main/java/graphql/kickstart/execution/instrumentation/ConfigurableDispatchInstrumentation.java

@@ -64,14 +64,17 @@ public InstrumentationState createState(InstrumentationCreateStateParameters par
 
   @Override
   public DataFetcher<?> instrumentDataFetcher(
-      DataFetcher<?> dataFetcher, InstrumentationFieldFetchParameters parameters) {
-    DataLoaderDispatcherInstrumentationState state = parameters.getInstrumentationState();
+      DataFetcher<?> dataFetcher,
+      InstrumentationFieldFetchParameters parameters,
+      InstrumentationState instrumentationState) {
+    DataLoaderDispatcherInstrumentationState state =
+        InstrumentationState.ofState(instrumentationState);
     if (state.isAggressivelyBatching()) {
       return dataFetcher;
     }
     //
     // currently only AsyncExecutionStrategy with DataLoader and hence this allows us to "dispatch"
-    // on every object if its not using aggressive batching for other execution strategies
+    // on every object if it's not using aggressive batching for other execution strategies
     // which allows them to work if used.
     return (DataFetcher<Object>)
         environment -> {
@@ -87,12 +90,14 @@ private void doImmediatelyDispatch(DataLoaderDispatcherInstrumentationState stat
 
   @Override
   public InstrumentationContext<ExecutionResult> beginExecuteOperation(
-      InstrumentationExecuteOperationParameters parameters) {
+      InstrumentationExecuteOperationParameters parameters,
+      InstrumentationState instrumentationState) {
     if (!isDataLoaderCompatible(parameters.getExecutionContext())) {
-      DataLoaderDispatcherInstrumentationState state = parameters.getInstrumentationState();
+      DataLoaderDispatcherInstrumentationState state =
+          InstrumentationState.ofState(instrumentationState);
       state.setAggressivelyBatching(false);
     }
-    return new SimpleInstrumentationContext<>();
+    return SimpleInstrumentationContext.noOp();
   }
 
   private boolean isDataLoaderCompatible(ExecutionContext executionContext) {
@@ -111,8 +116,10 @@ private boolean isDataLoaderCompatible(ExecutionContext executionContext) {
 
   @Override
   public ExecutionStrategyInstrumentationContext beginExecutionStrategy(
-      InstrumentationExecutionStrategyParameters parameters) {
-    DataLoaderDispatcherInstrumentationState state = parameters.getInstrumentationState();
+      InstrumentationExecutionStrategyParameters parameters,
+      InstrumentationState instrumentationState) {
+    DataLoaderDispatcherInstrumentationState state =
+        InstrumentationState.ofState(instrumentationState);
     //
     // if there are no data loaders, there is nothing to do
     //
@@ -134,21 +141,25 @@ public void onCompleted(ExecutionResult result, Throwable t) {
 
   @Override
   public InstrumentationContext<Object> beginFieldFetch(
-      InstrumentationFieldFetchParameters parameters) {
-    DataLoaderDispatcherInstrumentationState state = parameters.getInstrumentationState();
+      InstrumentationFieldFetchParameters parameters, InstrumentationState instrumentationState) {
+    DataLoaderDispatcherInstrumentationState state =
+        InstrumentationState.ofState(instrumentationState);
     //
     // if there are no data loaders, there is nothing to do
     //
     if (state.hasNoDataLoaders()) {
-      return new SimpleInstrumentationContext<>();
+      return SimpleInstrumentationContext.noOp();
     }
     return state.getApproach().beginFieldFetch(parameters);
   }
 
   @Override
   public CompletableFuture<ExecutionResult> instrumentExecutionResult(
-      ExecutionResult executionResult, InstrumentationExecutionParameters parameters) {
-    DataLoaderDispatcherInstrumentationState state = parameters.getInstrumentationState();
+      ExecutionResult executionResult,
+      InstrumentationExecutionParameters parameters,
+      InstrumentationState instrumentationState) {
+    DataLoaderDispatcherInstrumentationState state =
+        InstrumentationState.ofState(instrumentationState);
     state.getApproach().removeTracking(parameters.getExecutionInput().getExecutionId());
     if (!options.isIncludeStatistics()) {
       return CompletableFuture.completedFuture(executionResult);

graphql-java-kickstart/src/main/java/graphql/kickstart/execution/instrumentation/NoOpInstrumentationProvider.java

@@ -1,13 +1,13 @@
 package graphql.kickstart.execution.instrumentation;
 
 import graphql.execution.instrumentation.Instrumentation;
-import graphql.execution.instrumentation.SimpleInstrumentation;
+import graphql.execution.instrumentation.SimplePerformantInstrumentation;
 import graphql.kickstart.execution.config.InstrumentationProvider;
 
 public class NoOpInstrumentationProvider implements InstrumentationProvider {
 
   @Override
   public Instrumentation getInstrumentation() {
-    return SimpleInstrumentation.INSTANCE;
+    return SimplePerformantInstrumentation.INSTANCE;
   }
 }

graphql-java-servlet/build.gradle

@@ -29,7 +29,7 @@ dependencies {
     compileOnly 'org.osgi:org.osgi.service.metatype.annotations:1.4.1'
     compileOnly 'org.osgi:org.osgi.annotation:6.0.0'
 
-    testImplementation 'io.github.graphql-java:graphql-java-annotations:8.3'
+    testImplementation 'io.github.graphql-java:graphql-java-annotations:9.1'
 
     // Unit testing
     testImplementation "org.apache.groovy:groovy-all:4.0.10"

graphql-java-servlet/src/test/groovy/graphql/kickstart/servlet/DataLoaderDispatchingSpec.groovy

@@ -4,7 +4,7 @@ import com.fasterxml.jackson.databind.ObjectMapper
 import graphql.ExecutionInput
 import graphql.execution.instrumentation.ChainedInstrumentation
 import graphql.execution.instrumentation.Instrumentation
-import graphql.execution.instrumentation.SimpleInstrumentation
+import graphql.execution.instrumentation.SimplePerformantInstrumentation
 import graphql.execution.instrumentation.dataloader.DataLoaderDispatcherInstrumentationOptions
 import graphql.kickstart.execution.context.ContextSetting
 import graphql.kickstart.execution.context.DefaultGraphQLContext
@@ -14,7 +14,7 @@ import graphql.kickstart.servlet.context.GraphQLServletContextBuilder
 import graphql.schema.DataFetcher
 import graphql.schema.DataFetchingEnvironment
 import org.dataloader.BatchLoader
-import org.dataloader.DataLoader
+import org.dataloader.DataLoaderFactory
 import org.dataloader.DataLoaderRegistry
 import org.springframework.mock.web.MockHttpServletRequest
 import org.springframework.mock.web.MockHttpServletResponse
@@ -59,9 +59,9 @@ class DataLoaderDispatchingSpec extends Specification {
 
   def registry() {
     DataLoaderRegistry registry = new DataLoaderRegistry()
-    registry.register("A", DataLoader.newDataLoader(batchLoaderWithCounter(fetchCounterA)))
-    registry.register("B", DataLoader.newDataLoader(batchLoaderWithCounter(fetchCounterB)))
-    registry.register("C", DataLoader.newDataLoader(batchLoaderWithCounter(fetchCounterC)))
+    registry.register("A", DataLoaderFactory.newDataLoader(batchLoaderWithCounter(fetchCounterA)))
+    registry.register("B", DataLoaderFactory.newDataLoader(batchLoaderWithCounter(fetchCounterB)))
+    registry.register("C", DataLoaderFactory.newDataLoader(batchLoaderWithCounter(fetchCounterC)))
     registry
   }
 
@@ -120,7 +120,7 @@ class DataLoaderDispatchingSpec extends Specification {
     mapper.readValue(response.getContentAsByteArray(), List)
   }
 
-  Instrumentation simpleInstrumentation = new SimpleInstrumentation()
+  Instrumentation simpleInstrumentation = new SimplePerformantInstrumentation()
   ChainedInstrumentation chainedInstrumentation = new ChainedInstrumentation(Collections.singletonList(simpleInstrumentation))
   def simpleSupplier = { simpleInstrumentation }
   def chainedSupplier = { chainedInstrumentation }

graphql-java-servlet/src/test/groovy/graphql/kickstart/servlet/OsgiGraphQLHttpServletSpec.groovy

@@ -5,7 +5,7 @@ import graphql.annotations.annotationTypes.GraphQLField
 import graphql.annotations.annotationTypes.GraphQLName
 import graphql.annotations.processor.GraphQLAnnotations
 import graphql.execution.instrumentation.InstrumentationState
-import graphql.execution.instrumentation.SimpleInstrumentation
+import graphql.execution.instrumentation.SimplePerformantInstrumentation
 import graphql.execution.instrumentation.parameters.InstrumentationCreateStateParameters
 import graphql.kickstart.execution.GraphQLRequest
 import graphql.kickstart.execution.config.ExecutionStrategyProvider
@@ -349,7 +349,7 @@ class OsgiGraphQLHttpServletSpec extends Specification {
   def "instrumentation provider is bound and unbound"() {
     setup:
     def servlet = new OsgiGraphQLHttpServlet()
-    def instrumentation = new SimpleInstrumentation()
+    def instrumentation = new SimplePerformantInstrumentation()
     def instrumentationProvider = Mock(InstrumentationProvider)
     instrumentationProvider.getInstrumentation() >> instrumentation
     def request = GraphQLRequest.createIntrospectionRequest()