[java] update graphql-java dependency

SeleniumHQ · Oct 8, 2024 · abd4bce · abd4bce
1 parent e494661
commit abd4bce
Show file tree

Hide file tree

Showing 4 changed files with 25 additions and 17 deletions.
diff --git a/MODULE.bazel b/MODULE.bazel
@@ -178,8 +178,7 @@ maven.install(
         "com.google.auto.service:auto-service:1.1.1",
         "com.google.auto.service:auto-service-annotations:1.1.1",
         "com.google.googlejavaformat:google-java-format:jar:1.23.0",
-        "com.graphql-java:graphql-java:20.2",
-        "com.graphql-java:java-dataloader:3.2.0",
+        "com.graphql-java:graphql-java:22.3",
         "dev.failsafe:failsafe:3.3.2",
         "io.grpc:grpc-context:1.66.0",
         "io.lettuce:lettuce-core:6.4.0.RELEASE",

diff --git a/java/maven_install.json b/java/maven_install.json
@@ -1,7 +1,7 @@
 {
   "__AUTOGENERATED_FILE_DO_NOT_MODIFY_THIS_FILE_MANUALLY": "THERE_IS_NO_DATA_ONLY_ZUUL",
-  "__INPUT_ARTIFACTS_HASH": -809854593,
-  "__RESOLVED_ARTIFACTS_HASH": -1445024694,
+  "__INPUT_ARTIFACTS_HASH": -1369959342,
+  "__RESOLVED_ARTIFACTS_HASH": 2051378450,
   "conflict_resolution": {
     "com.google.code.gson:gson:2.8.9": "com.google.code.gson:gson:2.11.0",
     "com.google.errorprone:error_prone_annotations:2.3.2": "com.google.errorprone:error_prone_annotations:2.28.0",
@@ -194,17 +194,17 @@
     },
     "com.graphql-java:graphql-java": {
       "shasums": {
-        "jar": "98c63c1bf51876f84a3770573279be4f98bbfc2c86d6b4819c327fa1cbd2b137",
-        "sources": "2f8be51261734b4618551724a5730d1e6299a9adda171178027eacdc8010363a"
+        "jar": "8828fef5d8133d3d5ad23cee262a9b3ab4ce95aedf5e3332bb577a9aa7c627e0",
+        "sources": "122d4adc1c1491f86f08f6ba6206aa9f05d14a02cf36c73baad7e1d8034160a7"
       },
-      "version": "20.2"
+      "version": "22.3"
     },
     "com.graphql-java:java-dataloader": {
       "shasums": {
-        "jar": "b9c7d32aef05a2e33dc07c5ce45b713c405b61c6264cb0ed48aac003add3eaa4",
-        "sources": "ffecf802d587b05860d8ab116d3c6a8630f8eca5d3b5da783f8dd085e2ca0591"
+        "jar": "08cec84ac76e32b53ea666260f288f10b3731c21c89f9199b109ced2361f78b8",
+        "sources": "cea71f74025c2ca95618113345f888c780a99bf3133621b54007e1babaef2e14"
       },
-      "version": "3.2.0"
+      "version": "3.3.0"
     },
     "commons-codec:commons-codec": {
       "shasums": {
@@ -900,8 +900,7 @@
     ],
     "com.graphql-java:graphql-java": [
       "com.graphql-java:java-dataloader",
-      "org.reactivestreams:reactive-streams",
-      "org.slf4j:slf4j-api"
+      "org.reactivestreams:reactive-streams"
     ],
     "com.graphql-java:java-dataloader": [
       "org.slf4j:slf4j-api"
@@ -1425,16 +1424,18 @@
     ],
     "com.graphql-java:graphql-java": [
       "graphql",
+      "graphql.agent.result",
       "graphql.analysis",
       "graphql.analysis.values",
-      "graphql.cachecontrol",
       "graphql.collect",
       "graphql.com.google.common.base",
       "graphql.com.google.common.collect",
       "graphql.com.google.common.math",
       "graphql.com.google.common.primitives",
       "graphql.execution",
+      "graphql.execution.conditional",
       "graphql.execution.directives",
+      "graphql.execution.incremental",
       "graphql.execution.instrumentation",
       "graphql.execution.instrumentation.dataloader",
       "graphql.execution.instrumentation.fieldvalidation",
@@ -1444,11 +1445,15 @@
       "graphql.execution.preparsed",
       "graphql.execution.preparsed.persisted",
       "graphql.execution.reactive",
+      "graphql.execution.values",
+      "graphql.execution.values.legacycoercing",
       "graphql.extensions",
       "graphql.i18n",
+      "graphql.incremental",
       "graphql.introspection",
       "graphql.language",
       "graphql.normalized",
+      "graphql.normalized.incremental",
       "graphql.org.antlr.v4.runtime",
       "graphql.org.antlr.v4.runtime.atn",
       "graphql.org.antlr.v4.runtime.dfa",
@@ -1466,7 +1471,6 @@
       "graphql.schema.diff.reporting",
       "graphql.schema.diffing",
       "graphql.schema.diffing.ana",
-      "graphql.schema.diffing.dot",
       "graphql.schema.fetching",
       "graphql.schema.idl",
       "graphql.schema.idl.errors",
@@ -1475,6 +1479,7 @@
       "graphql.schema.usage",
       "graphql.schema.validation",
       "graphql.schema.visibility",
+      "graphql.schema.visitor",
       "graphql.util",
       "graphql.validation",
       "graphql.validation.rules"
@@ -1484,6 +1489,7 @@
       "org.dataloader.annotations",
       "org.dataloader.impl",
       "org.dataloader.registries",
+      "org.dataloader.scheduler",
       "org.dataloader.stats",
       "org.dataloader.stats.context"
     ],

diff --git a/java/src/org/openqa/selenium/grid/graphql/BUILD.bazel b/java/src/org/openqa/selenium/grid/graphql/BUILD.bazel
@@ -21,6 +21,5 @@ java_library(
         "//java/src/org/openqa/selenium/remote/http",
         artifact("com.google.guava:guava"),
         artifact("com.graphql-java:graphql-java"),
-        artifact("com.graphql-java:java-dataloader"),
     ],
 )
diff --git a/java/src/org/openqa/selenium/grid/graphql/GraphqlHandler.java b/java/src/org/openqa/selenium/grid/graphql/GraphqlHandler.java
@@ -45,6 +45,7 @@
 import java.net.URI;
 import java.util.HashMap;
 import java.util.Map;
+import java.util.concurrent.CompletableFuture;
 import java.util.concurrent.ExecutionException;
 import org.openqa.selenium.grid.distributor.Distributor;
 import org.openqa.selenium.grid.sessionqueue.NewSessionQueue;
@@ -88,7 +89,7 @@ public GraphqlHandler(
         new SchemaGenerator()
             .makeExecutableSchema(buildTypeDefinitionRegistry(), buildRuntimeWiring());
 
-    Cache<String, PreparsedDocumentEntry> cache =
+    Cache<String, CompletableFuture<PreparsedDocumentEntry>> cache =
         CacheBuilder.newBuilder().maximumSize(1024).build();
 
     graphQl =
@@ -97,7 +98,10 @@ public GraphqlHandler(
                 (executionInput, computeFunction) -> {
                   try {
                     return cache.get(
-                        executionInput.getQuery(), () -> computeFunction.apply(executionInput));
+                        executionInput.getQuery(),
+                        () ->
+                            CompletableFuture.supplyAsync(
+                                () -> computeFunction.apply(executionInput)));
                   } catch (ExecutionException e) {
                     if (e.getCause() instanceof RuntimeException) {
                       throw (RuntimeException) e.getCause();