Merge pull request #342 from graphql-java-kickstart/bugfix/469-apply-async-timeout

oliemansm · web-flow · commit da40bddcb95f · 2021-05-13T14:04:29.000+02:00
Bugfix/469 apply async timeout
diff --git a/.github/workflows/pull-request.yml b/.github/workflows/pull-request.yml
@@ -11,33 +11,6 @@ jobs:
       - uses: actions/checkout@v2
       - uses: gradle/wrapper-validation-action@v1
 
-  verify-google-java-format:
-    name: Google Java Format Verification
-    runs-on: ubuntu-latest
-    needs: validation
-    steps:
-      - name: Checkout
-        uses: actions/checkout@v2
-      - name: Setup Java
-        uses: actions/setup-java@v2
-        with:
-          distribution: 'zulu'
-          java-version: 15
-      - name: Cache Gradle
-        uses: actions/cache@v2
-        env:
-          java-version: 15
-        with:
-          path: |
-            ~/.gradle/caches
-            ~/.gradle/wrapper
-          key: ${{ runner.os }}-${{ env.java-version }}-gradle-${{ hashFiles('**/*.gradle*') }}
-          restore-keys: ${{ runner.os }}-${{ env.java-version }}-gradle-
-      - name: Make gradlew executable
-        run: chmod +x ./gradlew
-      - name: Gradle Check
-        run: ./gradlew --info build -x test
-
   test:
     name: Test run
     strategy:
@@ -70,11 +43,11 @@ jobs:
         run: chmod +x ./gradlew
       - name: Gradle Check (non-Windows)
         if: matrix.os != 'windows-latest'
-        run: ./gradlew --info check -x verifyGoogleJavaFormat
+        run: ./gradlew --info check
       - name: Gradle Check (Windows)
         if: matrix.os == 'windows-latest'
         shell: cmd
-        run: gradlew --info check -x verifyGoogleJavaFormat
+        run: gradlew --info check
 
   build:
     name: Sonar analysis
@@ -112,4 +85,4 @@ jobs:
         env:
           GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}  # Needed to get PR information, if any
           SONAR_TOKEN: ${{ secrets.SONAR_TOKEN }}
-        run: ./gradlew build jacocoTestReport sonarqube --info -x verifyGoogleJavaFormat
+        run: ./gradlew build jacocoTestReport sonarqube --info
diff --git a/.github/workflows/release.yml b/.github/workflows/release.yml
@@ -35,7 +35,7 @@ jobs:
       - name: Make gradlew executable
         run: chmod +x ./gradlew
       - name: Gradle Check
-        run: ./gradlew --info check -x verifyGoogleJavaFormat
+        run: ./gradlew --info check
 
   build:
     name: Publish release
diff --git a/.github/workflows/snapshot.yml b/.github/workflows/snapshot.yml
@@ -12,33 +12,6 @@ jobs:
       - uses: actions/checkout@v2
       - uses: gradle/wrapper-validation-action@v1
 
-  verify-google-java-format:
-    name: Google Java Format Verification
-    runs-on: ubuntu-latest
-    needs: validation
-    steps:
-      - name: Checkout
-        uses: actions/checkout@v2
-      - name: Setup Java
-        uses: actions/setup-java@v2
-        with:
-          distribution: 'zulu'
-          java-version: 15
-      - name: Cache Gradle
-        uses: actions/cache@v2
-        env:
-          java-version: 15
-        with:
-          path: |
-            ~/.gradle/caches
-            ~/.gradle/wrapper
-          key: ${{ runner.os }}-${{ env.java-version }}-gradle-${{ hashFiles('**/*.gradle*') }}
-          restore-keys: ${{ runner.os }}-${{ env.java-version }}-gradle-
-      - name: Make gradlew executable
-        run: chmod +x ./gradlew
-      - name: Gradle Check
-        run: ./gradlew --info build -x test
-
   test:
     name: Test run
     needs: validation
@@ -65,7 +38,7 @@ jobs:
       - name: Make gradlew executable
         run: chmod +x ./gradlew
       - name: Gradle Check
-        run: ./gradlew --info check -x verifyGoogleJavaFormat
+        run: ./gradlew --info check
 
   build:
     name: Publish snapshot
@@ -97,7 +70,7 @@ jobs:
         env:
           OSS_USER_TOKEN_KEY: ${{ secrets.OSS_USER_TOKEN_KEY }}
           OSS_USER_TOKEN_PASS: ${{ secrets.OSS_USER_TOKEN_PASS }}
-        run: ./gradlew clean build publish -x test -x verifyGoogleJavaFormat
+        run: ./gradlew clean build publish -x test
 
   sonar:
     name: Sonar analysis
@@ -129,4 +102,4 @@ jobs:
           GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}  # Needed to get PR information, if any
           SONAR_TOKEN: ${{ secrets.SONAR_TOKEN }}
         if: env.SONAR_TOKEN != null
-        run: ./gradlew build jacocoTestReport sonarqube --info -x verifyGoogleJavaFormat
+        run: ./gradlew build jacocoTestReport sonarqube --info
diff --git a/build.gradle b/build.gradle
@@ -31,7 +31,6 @@ plugins {
     id "org.sonarqube" version "3.2.0"
     id "jacoco"
     id 'io.codearte.nexus-staging' version '0.30.0'
-    id 'com.github.sherter.google-java-format' version '0.9' apply false
 }
 
 sonarqube {
@@ -49,7 +48,6 @@ subprojects {
     apply plugin: 'java'
     apply plugin: 'maven-publish'
     apply plugin: 'signing'
-    apply plugin: 'com.github.sherter.google-java-format'
 
     repositories {
         mavenLocal()
@@ -80,8 +78,6 @@ subprojects {
 
     compileJava.dependsOn(processResources)
 
-    compileJava.mustRunAfter verifyGoogleJavaFormat
-
     test {
         useJUnitPlatform()
 
diff --git a/github-build.sh b/github-build.sh
@@ -45,7 +45,7 @@ git config --global user.name "GitHub Actions"
 echo "Deploying release to Maven Central"
 removeSnapshots
 
-./gradlew clean build publish closeAndReleaseRepository -x verifyGoogleJavaFormat
+./gradlew clean build publish closeAndReleaseRepository
 
 commitRelease
 bumpVersion
diff --git a/graphql-java-kickstart/src/main/java/graphql/kickstart/execution/FutureBatchedExecutionResult.java b/graphql-java-kickstart/src/main/java/graphql/kickstart/execution/FutureBatchedExecutionResult.java
@@ -0,0 +1,26 @@
+package graphql.kickstart.execution;
+
+import graphql.ExecutionResult;
+import graphql.kickstart.execution.input.GraphQLInvocationInput;
+import java.util.List;
+import java.util.concurrent.CompletableFuture;
+import lombok.Getter;
+import lombok.RequiredArgsConstructor;
+
+@RequiredArgsConstructor
+class FutureBatchedExecutionResult implements FutureExecutionResult {
+
+  @Getter
+  private final GraphQLInvocationInput invocationInput;
+  private final CompletableFuture<List<ExecutionResult>> batched;
+
+  @Override
+  public CompletableFuture<GraphQLQueryResult> thenApplyQueryResult() {
+    return batched.thenApply(GraphQLQueryResult::create);
+  }
+
+  @Override
+  public void cancel() {
+    batched.cancel(true);
+  }
+}
diff --git a/graphql-java-kickstart/src/main/java/graphql/kickstart/execution/FutureErrorExecutionResult.java b/graphql-java-kickstart/src/main/java/graphql/kickstart/execution/FutureErrorExecutionResult.java
@@ -0,0 +1,26 @@
+package graphql.kickstart.execution;
+
+import graphql.kickstart.execution.input.GraphQLInvocationInput;
+import java.util.concurrent.CompletableFuture;
+import lombok.RequiredArgsConstructor;
+
+@RequiredArgsConstructor
+class FutureErrorExecutionResult implements FutureExecutionResult {
+
+  private final GraphQLErrorQueryResult errorQueryResult;
+
+  @Override
+  public CompletableFuture<GraphQLQueryResult> thenApplyQueryResult() {
+    return CompletableFuture.completedFuture(errorQueryResult);
+  }
+
+  @Override
+  public GraphQLInvocationInput getInvocationInput() {
+    return null;
+  }
+
+  @Override
+  public void cancel() {
+    // nothing to do
+  }
+}
diff --git a/graphql-java-kickstart/src/main/java/graphql/kickstart/execution/FutureExecutionResult.java b/graphql-java-kickstart/src/main/java/graphql/kickstart/execution/FutureExecutionResult.java
@@ -0,0 +1,29 @@
+package graphql.kickstart.execution;
+
+import graphql.ExecutionResult;
+import graphql.kickstart.execution.input.GraphQLInvocationInput;
+import java.util.List;
+import java.util.concurrent.CompletableFuture;
+
+public interface FutureExecutionResult {
+
+  static FutureExecutionResult single(
+      GraphQLInvocationInput invocationInput, CompletableFuture<ExecutionResult> single) {
+    return new FutureSingleExecutionResult(invocationInput, single);
+  }
+
+  static FutureExecutionResult batched(
+      GraphQLInvocationInput invocationInput, CompletableFuture<List<ExecutionResult>> batched) {
+    return new FutureBatchedExecutionResult(invocationInput, batched);
+  }
+
+  static FutureExecutionResult error(GraphQLErrorQueryResult result) {
+    return new FutureErrorExecutionResult(result);
+  }
+
+  CompletableFuture<GraphQLQueryResult> thenApplyQueryResult();
+
+  GraphQLInvocationInput getInvocationInput();
+
+  void cancel();
+}
diff --git a/graphql-java-kickstart/src/main/java/graphql/kickstart/execution/FutureSingleExecutionResult.java b/graphql-java-kickstart/src/main/java/graphql/kickstart/execution/FutureSingleExecutionResult.java
@@ -0,0 +1,25 @@
+package graphql.kickstart.execution;
+
+import graphql.ExecutionResult;
+import graphql.kickstart.execution.input.GraphQLInvocationInput;
+import java.util.concurrent.CompletableFuture;
+import lombok.Getter;
+import lombok.RequiredArgsConstructor;
+
+@RequiredArgsConstructor
+class FutureSingleExecutionResult implements FutureExecutionResult {
+
+  @Getter
+  private final GraphQLInvocationInput invocationInput;
+  private final CompletableFuture<ExecutionResult> single;
+
+  @Override
+  public CompletableFuture<GraphQLQueryResult> thenApplyQueryResult() {
+    return single.thenApply(GraphQLQueryResult::create);
+  }
+
+  @Override
+  public void cancel() {
+    single.cancel(true);
+  }
+}
diff --git a/graphql-java-kickstart/src/main/java/graphql/kickstart/execution/GraphQLInvoker.java b/graphql-java-kickstart/src/main/java/graphql/kickstart/execution/GraphQLInvoker.java
@@ -12,14 +12,25 @@
 import java.util.List;
 import java.util.concurrent.CompletableFuture;
 import lombok.RequiredArgsConstructor;
+import lombok.extern.slf4j.Slf4j;
 
+@Slf4j
 @RequiredArgsConstructor
 public class GraphQLInvoker {
 
   private final GraphQLBuilder graphQLBuilder;
   private final BatchedDataLoaderGraphQLBuilder batchedDataLoaderGraphQLBuilder;
   private final GraphQLInvokerProxy proxy = GraphQL::executeAsync;
 
+  public FutureExecutionResult execute(GraphQLInvocationInput invocationInput) {
+    if (invocationInput instanceof GraphQLSingleInvocationInput) {
+      return FutureExecutionResult.single(
+          invocationInput, executeAsync((GraphQLSingleInvocationInput) invocationInput));
+    }
+    return FutureExecutionResult.batched(
+        invocationInput, executeAsync((GraphQLBatchedInvocationInput) invocationInput));
+  }
+
   public CompletableFuture<ExecutionResult> executeAsync(
       GraphQLSingleInvocationInput invocationInput) {
     GraphQL graphQL = graphQLBuilder.build(invocationInput.getSchema());
diff --git a/graphql-java-servlet/src/main/java/graphql/kickstart/servlet/AsyncTimeoutListener.java b/graphql-java-servlet/src/main/java/graphql/kickstart/servlet/AsyncTimeoutListener.java
@@ -0,0 +1,14 @@
+package graphql.kickstart.servlet;
+
+import java.io.IOException;
+import javax.servlet.AsyncEvent;
+import javax.servlet.AsyncListener;
+
+interface AsyncTimeoutListener extends AsyncListener {
+
+  default void onComplete(AsyncEvent event) throws IOException {}
+
+  default void onError(AsyncEvent event) throws IOException {}
+
+  default void onStartAsync(AsyncEvent event) throws IOException {}
+}
diff --git a/graphql-java-servlet/src/main/java/graphql/kickstart/servlet/HttpRequestInvokerImpl.java b/graphql-java-servlet/src/main/java/graphql/kickstart/servlet/HttpRequestInvokerImpl.java
diff --git a/graphql-java-servlet/src/main/java/graphql/kickstart/servlet/SingleQueryResponseWriter.java b/graphql-java-servlet/src/main/java/graphql/kickstart/servlet/SingleQueryResponseWriter.java
diff --git a/graphql-java-servlet/src/test/groovy/graphql/kickstart/servlet/cache/CachingHttpRequestInvokerTest.groovy b/graphql-java-servlet/src/test/groovy/graphql/kickstart/servlet/cache/CachingHttpRequestInvokerTest.groovy
