Merge pull request #285 from artem-ag/graphql-java-16

oliemansm · web-flow · commit 6941161e7193 · 2020-12-20T16:00:44.000+01:00
Update graphql-java-servlet to support graphql-java 16.
diff --git a/build.gradle b/build.gradle
@@ -83,7 +83,7 @@ subprojects {
     compileJava.dependsOn(processResources)
 
     lombok {
-        version = "1.18.4"
+        version = "1.18.16"
         sha256 = ""
     }
 
diff --git a/gradle.properties b/gradle.properties
@@ -7,8 +7,9 @@ PROJECT_LICENSE=MIT
 PROJECT_LICENSE_URL=https://github.com/graphql-java-kickstart/spring-boot-graphql/blob/master/LICENSE.md
 PROJECT_DEV_ID=apottere
 PROJECT_DEV_NAME=Andrew Potter
-LIB_GRAPHQL_JAVA_VER=15.0
-LIB_JACKSON_VER=2.10.0
+LIB_GRAPHQL_JAVA_VER=16.1
+LIB_JACKSON_VER=2.12.0
+LIB_SLF4J_VER=1.7.30
 SOURCE_COMPATIBILITY=1.8
 TARGET_COMPATIBILITY=1.8
-GRADLE_WRAPPER_VER=6.0.1
+GRADLE_WRAPPER_VER=6.7.1
diff --git a/gradle/wrapper/gradle-wrapper.properties b/gradle/wrapper/gradle-wrapper.properties
@@ -1,5 +1,5 @@
 distributionBase=GRADLE_USER_HOME
 distributionPath=wrapper/dists
-distributionUrl=https\://services.gradle.org/distributions/gradle-6.6.1-all.zip
+distributionUrl=https\://services.gradle.org/distributions/gradle-6.7.1-all.zip
 zipStoreBase=GRADLE_USER_HOME
 zipStorePath=wrapper/dists
diff --git a/graphql-java-kickstart/build.gradle b/graphql-java-kickstart/build.gradle
@@ -7,6 +7,7 @@ jar {
 dependencies {
     // GraphQL
     compile "com.graphql-java:graphql-java:$LIB_GRAPHQL_JAVA_VER"
+    implementation "org.slf4j:slf4j-api:$LIB_SLF4J_VER"
 
     // JSON
     compile "com.fasterxml.jackson.core:jackson-core:$LIB_JACKSON_VER"
diff --git a/graphql-java-kickstart/src/main/java/graphql/kickstart/execution/DecoratedExecutionResult.java b/graphql-java-kickstart/src/main/java/graphql/kickstart/execution/DecoratedExecutionResult.java
@@ -14,12 +14,7 @@ class DecoratedExecutionResult implements ExecutionResult {
   private final ExecutionResult result;
 
   boolean isAsynchronous() {
-    return result.getData() instanceof Publisher || isDeferred();
-  }
-
-  private boolean isDeferred() {
-    return result.getExtensions() != null && result.getExtensions()
-        .containsKey(GraphQL.DEFERRED_RESULTS);
+    return result.getData() instanceof Publisher;
   }
 
   @Override
diff --git a/graphql-java-kickstart/src/main/java/graphql/kickstart/execution/GraphQLObjectMapper.java b/graphql-java-kickstart/src/main/java/graphql/kickstart/execution/GraphQLObjectMapper.java
@@ -7,12 +7,10 @@
 import com.fasterxml.jackson.databind.MappingIterator;
 import com.fasterxml.jackson.databind.ObjectMapper;
 import com.fasterxml.jackson.databind.ObjectReader;
-import graphql.DeferredExecutionResult;
-import graphql.DeferredExecutionResultImpl;
 import graphql.ExecutionResult;
 import graphql.ExecutionResultImpl;
 import graphql.GraphQLError;
-import graphql.execution.ExecutionPath;
+import graphql.execution.ResultPath;
 import graphql.kickstart.execution.config.ConfiguringObjectMapperProvider;
 import graphql.kickstart.execution.config.GraphQLServletObjectMapperConfigurer;
 import graphql.kickstart.execution.config.ObjectMapperProvider;
@@ -137,13 +135,6 @@ public ExecutionResult sanitizeErrors(ExecutionResult executionResult) {
 
   public Map<String, Object> createResultFromExecutionResult(ExecutionResult executionResult) {
     ExecutionResult sanitizedExecutionResult = sanitizeErrors(executionResult);
-    if (executionResult instanceof DeferredExecutionResult) {
-      sanitizedExecutionResult = DeferredExecutionResultImpl
-          .newDeferredExecutionResult()
-          .from(executionResult)
-          .path(ExecutionPath.fromList(((DeferredExecutionResult) executionResult).getPath()))
-          .build();
-    }
     return convertSanitizedExecutionResult(sanitizedExecutionResult);
   }
 
@@ -168,10 +159,6 @@ public Map<String, Object> convertSanitizedExecutionResult(ExecutionResult execu
       result.put("data", executionResult.getData());
     }
 
-    if (executionResult instanceof DeferredExecutionResult) {
-      result.put("path", ((DeferredExecutionResult) executionResult).getPath());
-    }
-
     return result;
   }
 
diff --git a/graphql-java-kickstart/src/main/java/graphql/kickstart/execution/instrumentation/AbstractTrackingApproach.java b/graphql-java-kickstart/src/main/java/graphql/kickstart/execution/instrumentation/AbstractTrackingApproach.java
@@ -2,13 +2,11 @@
 
 import graphql.ExecutionResult;
 import graphql.execution.ExecutionId;
-import graphql.execution.ExecutionPath;
 import graphql.execution.FieldValueInfo;
 import graphql.execution.MergedField;
-import graphql.execution.instrumentation.DeferredFieldInstrumentationContext;
+import graphql.execution.ResultPath;
 import graphql.execution.instrumentation.ExecutionStrategyInstrumentationContext;
 import graphql.execution.instrumentation.InstrumentationContext;
-import graphql.execution.instrumentation.parameters.InstrumentationDeferredFieldParameters;
 import graphql.execution.instrumentation.parameters.InstrumentationExecutionStrategyParameters;
 import graphql.execution.instrumentation.parameters.InstrumentationFieldFetchParameters;
 import java.util.Collections;
@@ -42,7 +40,7 @@ protected RequestStack getStack() {
   public ExecutionStrategyInstrumentationContext beginExecutionStrategy(
       InstrumentationExecutionStrategyParameters parameters) {
     ExecutionId executionId = parameters.getExecutionContext().getExecutionId();
-    ExecutionPath path = parameters.getExecutionStrategyParameters().getPath();
+    ResultPath path = parameters.getExecutionStrategyParameters().getPath();
     int parentLevel = path.getLevel();
     int curLevel = parentLevel + 1;
     int fieldCount = parameters.getExecutionStrategyParameters().getFields().size();
@@ -72,18 +70,6 @@ public void onFieldValuesInfo(List<FieldValueInfo> fieldValueInfoList) {
           }
         }
       }
-
-      @Override
-      public void onDeferredField(MergedField field) {
-        // fake fetch count for this field
-        synchronized (stack) {
-          stack.increaseFetchCount(executionId, curLevel);
-          stack.setStatus(executionId, dispatchIfNeeded(stack, executionId, curLevel));
-          if (stack.allReady()) {
-            dispatchWithoutLocking();
-          }
-        }
-      }
     };
   }
 
@@ -118,45 +104,11 @@ private int getCountForList(FieldValueInfo fieldValueInfo) {
     return result;
   }
 
-  @Override
-  public DeferredFieldInstrumentationContext beginDeferredField(
-      InstrumentationDeferredFieldParameters parameters) {
-    ExecutionId executionId = parameters.getExecutionContext().getExecutionId();
-    int level = parameters.getExecutionStrategyParameters().getPath().getLevel();
-    synchronized (stack) {
-      stack.clearAndMarkCurrentLevelAsReady(executionId, level);
-    }
-
-    return new DeferredFieldInstrumentationContext() {
-      @Override
-      public void onDispatched(CompletableFuture<ExecutionResult> result) {
-        // default empty implementation
-      }
-
-      @Override
-      public void onCompleted(ExecutionResult result, Throwable t) {
-        // default empty implementation
-      }
-
-      @Override
-      public void onFieldValueInfo(FieldValueInfo fieldValueInfo) {
-        synchronized (stack) {
-          stack.setStatus(executionId,
-              handleOnFieldValuesInfo(Collections.singletonList(fieldValueInfo), stack, executionId,
-                  level));
-          if (stack.allReady()) {
-            dispatchWithoutLocking();
-          }
-        }
-      }
-    };
-  }
-
   @Override
   public InstrumentationContext<Object> beginFieldFetch(
       InstrumentationFieldFetchParameters parameters) {
     ExecutionId executionId = parameters.getExecutionContext().getExecutionId();
-    ExecutionPath path = parameters.getEnvironment().getExecutionStepInfo().getPath();
+    ResultPath path = parameters.getEnvironment().getExecutionStepInfo().getPath();
     int level = path.getLevel();
     return new InstrumentationContext<Object>() {
 
diff --git a/graphql-java-kickstart/src/main/java/graphql/kickstart/execution/instrumentation/ConfigurableDispatchInstrumentation.java b/graphql-java-kickstart/src/main/java/graphql/kickstart/execution/instrumentation/ConfigurableDispatchInstrumentation.java
@@ -5,15 +5,13 @@
 import graphql.execution.AsyncExecutionStrategy;
 import graphql.execution.ExecutionContext;
 import graphql.execution.ExecutionStrategy;
-import graphql.execution.instrumentation.DeferredFieldInstrumentationContext;
 import graphql.execution.instrumentation.ExecutionStrategyInstrumentationContext;
 import graphql.execution.instrumentation.InstrumentationContext;
 import graphql.execution.instrumentation.InstrumentationState;
 import graphql.execution.instrumentation.SimpleInstrumentationContext;
 import graphql.execution.instrumentation.dataloader.DataLoaderDispatcherInstrumentation;
 import graphql.execution.instrumentation.dataloader.DataLoaderDispatcherInstrumentationOptions;
 import graphql.execution.instrumentation.parameters.InstrumentationCreateStateParameters;
-import graphql.execution.instrumentation.parameters.InstrumentationDeferredFieldParameters;
 import graphql.execution.instrumentation.parameters.InstrumentationExecuteOperationParameters;
 import graphql.execution.instrumentation.parameters.InstrumentationExecutionParameters;
 import graphql.execution.instrumentation.parameters.InstrumentationExecutionStrategyParameters;
@@ -133,30 +131,6 @@ public void onCompleted(ExecutionResult result, Throwable t) {
     return state.getApproach().beginExecutionStrategy(parameters);
   }
 
-  @Override
-  public DeferredFieldInstrumentationContext beginDeferredField(
-      InstrumentationDeferredFieldParameters parameters) {
-    DataLoaderDispatcherInstrumentationState state = parameters.getInstrumentationState();
-    //
-    // if there are no data loaders, there is nothing to do
-    //
-    if (state.hasNoDataLoaders()) {
-      return new DeferredFieldInstrumentationContext() {
-        @Override
-        public void onDispatched(CompletableFuture<ExecutionResult> result) {
-          // default empty implementation
-        }
-
-        @Override
-        public void onCompleted(ExecutionResult result, Throwable t) {
-          // default empty implementation
-        }
-      };
-
-    }
-    return state.getApproach().beginDeferredField(parameters);
-  }
-
   @Override
   public InstrumentationContext<Object> beginFieldFetch(
       InstrumentationFieldFetchParameters parameters) {
diff --git a/graphql-java-kickstart/src/main/java/graphql/kickstart/execution/instrumentation/TrackingApproach.java b/graphql-java-kickstart/src/main/java/graphql/kickstart/execution/instrumentation/TrackingApproach.java
@@ -1,11 +1,9 @@
 package graphql.kickstart.execution.instrumentation;
 
 import graphql.execution.ExecutionId;
-import graphql.execution.instrumentation.DeferredFieldInstrumentationContext;
 import graphql.execution.instrumentation.ExecutionStrategyInstrumentationContext;
 import graphql.execution.instrumentation.InstrumentationContext;
 import graphql.execution.instrumentation.InstrumentationState;
-import graphql.execution.instrumentation.parameters.InstrumentationDeferredFieldParameters;
 import graphql.execution.instrumentation.parameters.InstrumentationExecutionStrategyParameters;
 import graphql.execution.instrumentation.parameters.InstrumentationFieldFetchParameters;
 
@@ -33,15 +31,6 @@ public interface TrackingApproach extends InstrumentationState {
   ExecutionStrategyInstrumentationContext beginExecutionStrategy(
       InstrumentationExecutionStrategyParameters parameters);
 
-  /**
-   * Handles approach specific logic for DataLoaderDispatcherInstrumentation.
-   *
-   * @param parameters parameters supplied to DataLoaderDispatcherInstrumentation
-   * @return the instrumented context
-   */
-  DeferredFieldInstrumentationContext beginDeferredField(
-      InstrumentationDeferredFieldParameters parameters);
-
   /**
    * Handles approach specific logic for DataLoaderDispatcherInstrumentation.
    *
diff --git a/graphql-java-servlet/build.gradle b/graphql-java-servlet/build.gradle
@@ -19,6 +19,7 @@ dependencies {
     // Servlet
     compile 'javax.servlet:javax.servlet-api:3.1.0'
     compile 'javax.websocket:javax.websocket-api:1.1'
+    implementation "org.slf4j:slf4j-api:$LIB_SLF4J_VER"
 
     // OSGi
     compileOnly 'org.osgi:org.osgi.core:6.0.0'
@@ -35,7 +36,7 @@ dependencies {
     testCompile "org.spockframework:spock-core:1.1-groovy-2.4-rc-3"
     testRuntime "cglib:cglib-nodep:3.2.4"
     testRuntime "org.objenesis:objenesis:2.5.1"
-    testCompile 'org.slf4j:slf4j-simple:1.7.24'
+    testCompile "org.slf4j:slf4j-simple:$LIB_SLF4J_VER"
     testCompile 'org.springframework:spring-test:4.3.7.RELEASE'
     testRuntime 'org.springframework:spring-web:4.3.7.RELEASE'
     testCompile 'com.google.guava:guava:24.1.1-jre'
diff --git a/graphql-java-servlet/src/main/java/graphql/kickstart/servlet/OsgiGraphQLHttpServlet.java b/graphql-java-servlet/src/main/java/graphql/kickstart/servlet/OsgiGraphQLHttpServlet.java
@@ -3,6 +3,7 @@
 import static graphql.schema.GraphQLObjectType.newObject;
 import static graphql.schema.GraphQLSchema.newSchema;
 
+import graphql.Scalars;
 import graphql.execution.preparsed.NoOpPreparsedDocumentProvider;
 import graphql.execution.preparsed.PreparsedDocumentProvider;
 import graphql.kickstart.execution.GraphQLObjectMapper;
@@ -29,6 +30,7 @@
 import graphql.kickstart.servlet.osgi.GraphQLSubscriptionProvider;
 import graphql.kickstart.servlet.osgi.GraphQLTypesProvider;
 import graphql.schema.GraphQLCodeRegistry;
+import graphql.schema.GraphQLFieldDefinition;
 import graphql.schema.GraphQLObjectType;
 import graphql.schema.GraphQLType;
 import java.util.ArrayList;
@@ -142,10 +144,20 @@ private void doUpdateSchema() {
     final GraphQLObjectType.Builder queryTypeBuilder = newObject().name("Query")
         .description("Root query type");
 
-    for (GraphQLQueryProvider provider : queryProviders) {
-      if (provider.getQueries() != null && !provider.getQueries().isEmpty()) {
-        provider.getQueries().forEach(queryTypeBuilder::field);
+    if (!queryProviders.isEmpty()) {
+      for (GraphQLQueryProvider provider : queryProviders) {
+        if (provider.getQueries() != null && !provider.getQueries().isEmpty()) {
+            provider.getQueries().forEach(queryTypeBuilder::field);
+        }
       }
+    } else {
+      // graphql-java enforces Query type to be there with at least some field.
+      queryTypeBuilder.field(
+        GraphQLFieldDefinition
+          .newFieldDefinition()
+          .name("_empty")
+          .type(Scalars.GraphQLBoolean)
+          .build());
     }
 
     final Set<GraphQLType> types = new HashSet<>();
diff --git a/graphql-java-servlet/src/main/java/graphql/kickstart/servlet/SingleAsynchronousQueryResponseWriter.java b/graphql-java-servlet/src/main/java/graphql/kickstart/servlet/SingleAsynchronousQueryResponseWriter.java
@@ -43,10 +43,6 @@ public void write(HttpServletRequest request, HttpServletResponse response) {
       publishers.add(result.getData());
     } else {
       publishers.add(new StaticDataPublisher<>(result));
-      final Publisher<ExecutionResult> deferredResultsPublisher = (Publisher<ExecutionResult>) result
-          .getExtensions()
-          .get(GraphQL.DEFERRED_RESULTS);
-      publishers.add(deferredResultsPublisher);
     }
     publishers.forEach(it -> it.subscribe(subscriber));
 
diff --git a/graphql-java-servlet/src/test/groovy/graphql/kickstart/servlet/AbstractGraphQLHttpServletSpec.groovy b/graphql-java-servlet/src/test/groovy/graphql/kickstart/servlet/AbstractGraphQLHttpServletSpec.groovy
diff --git a/graphql-java-servlet/src/test/groovy/graphql/kickstart/servlet/TestUtils.groovy b/graphql-java-servlet/src/test/groovy/graphql/kickstart/servlet/TestUtils.groovy

Original file line number	Diff line number	Diff line change
`@@ -83,7 +83,7 @@ subprojects {`
`83`	`83`	`compileJava.dependsOn(processResources)`
`84`	`84`
`85`	`85`	`lombok {`
`86`		`- version = "1.18.4"`
	`86`	`+ version = "1.18.16"`
`87`	`87`	`sha256 = ""`
`88`	`88`	`}`
`89`	`89`