Merge branch 'main' into fix/keycloak-oom

quarkusio · Jul 11, 2024 · 0b22c10 · 0b22c10
2 parents 7743d50 + 8eb2489
commit 0b22c10
Show file tree

Hide file tree

Showing 7 changed files with 29 additions and 3 deletions.
diff --git a/bom/application/pom.xml b/bom/application/pom.xml
@@ -38,7 +38,7 @@
         <micrometer.version>1.12.5</micrometer.version><!-- keep in sync with hdrhistogram -->
         <hdrhistogram.version>2.1.12</hdrhistogram.version><!-- keep in sync with micrometer -->
         <google-auth.version>0.22.0</google-auth.version>
-        <graphql-java.version>21.3</graphql-java.version> <!-- keep in sync with smallrye-graphql -->
+        <graphql-java.version>22.1</graphql-java.version> <!-- keep in sync with smallrye-graphql -->
         <microprofile-config-api.version>3.1</microprofile-config-api.version>
         <microprofile-health-api.version>4.0.1</microprofile-health-api.version>
         <microprofile-metrics-api.version>4.0.1</microprofile-metrics-api.version>
@@ -55,7 +55,7 @@
         <smallrye-health.version>4.1.0</smallrye-health.version>
         <smallrye-metrics.version>4.0.0</smallrye-metrics.version>
         <smallrye-open-api.version>3.10.0</smallrye-open-api.version>
-        <smallrye-graphql.version>2.8.6</smallrye-graphql.version>
+        <smallrye-graphql.version>2.9.0</smallrye-graphql.version>
         <smallrye-fault-tolerance.version>6.3.0</smallrye-fault-tolerance.version>
         <smallrye-jwt.version>4.5.3</smallrye-jwt.version>
         <smallrye-context-propagation.version>2.1.2</smallrye-context-propagation.version>

diff --git a/...oyment/src/main/java/io/quarkus/smallrye/graphql/deployment/SmallRyeGraphQLProcessor.java b/...oyment/src/main/java/io/quarkus/smallrye/graphql/deployment/SmallRyeGraphQLProcessor.java
@@ -53,6 +53,7 @@
 import io.quarkus.deployment.builditem.nativeimage.ReflectiveClassBuildItem;
 import io.quarkus.deployment.builditem.nativeimage.ReflectiveClassConditionBuildItem;
 import io.quarkus.deployment.builditem.nativeimage.ReflectiveHierarchyBuildItem;
+import io.quarkus.deployment.builditem.nativeimage.RuntimeInitializedClassBuildItem;
 import io.quarkus.deployment.builditem.nativeimage.ServiceProviderBuildItem;
 import io.quarkus.deployment.metrics.MetricsCapabilityBuildItem;
 import io.quarkus.maven.dependency.GACT;
@@ -241,6 +242,11 @@ void registerNativeResourceBundle(BuildProducer<NativeImageResourceBundleBuildIt
         nativeResourceBundleProvider.produce(new NativeImageResourceBundleBuildItem("i18n.Parsing"));
     }
 
+    @BuildStep
+    void runtimeInitializedClasses(BuildProducer<RuntimeInitializedClassBuildItem> runtimeInitializedClasses) {
+        runtimeInitializedClasses.produce(new RuntimeInitializedClassBuildItem("graphql.util.IdGenerator"));
+    }
+
     @BuildStep
     SmallRyeGraphQLModifiedClasesBuildItem createIndex(TransformedClassesBuildItem transformedClassesBuildItem) {
         Map<String, byte[]> modifiedClasses = new HashMap<>();

diff --git a/...l/deployment/src/main/java/io/quarkus/vertx/graphql/deployment/VertxGraphqlProcessor.java b/...l/deployment/src/main/java/io/quarkus/vertx/graphql/deployment/VertxGraphqlProcessor.java
@@ -103,4 +103,9 @@ void registerVertxGraphqlUI(VertxGraphqlRecorder recorder, VertxGraphqlConfig co
     private static boolean doNotIncludeVertxGraphqlUi(LaunchModeBuildItem launchMode, VertxGraphqlConfig config) {
         return !launchMode.getLaunchMode().isDevOrTest() && !config.ui.alwaysInclude;
     }
+
+    @BuildStep
+    void runtimeInitializedClasses(BuildProducer<RuntimeInitializedClassBuildItem> runtimeInitializedClasses) {
+        runtimeInitializedClasses.produce(new RuntimeInitializedClassBuildItem("graphql.util.IdGenerator"));
+    }
 }
diff --git a/...ss/resteasy/reactive/server/vertx/serializers/ServerMutinyAsyncFileMessageBodyWriter.java b/...ss/resteasy/reactive/server/vertx/serializers/ServerMutinyAsyncFileMessageBodyWriter.java
@@ -65,7 +65,9 @@ public void writeResponse(AsyncFile file, Type genericType, ServerRequestContext
         file.endHandler(new Runnable() {
             @Override
             public void run() {
-                file.close();
+                // we don't need to wait for the file to be closed, we just need to make sure it does get closed
+                //noinspection ResultOfMethodCallIgnored
+                file.close().subscribeAsCompletionStage();
                 response.end();
                 // Not sure if I need to resume, actually
                 ctx.resume();

diff --git a/tcks/microprofile-graphql/src/main/resources/overrides/basicScalarTests.csv b/tcks/microprofile-graphql/src/main/resources/overrides/basicScalarTests.csv
@@ -0,0 +1,3 @@
+# Basic Scalar Types
+23| type ScalarHolder       |   charArray: [String!]                                                                                                     |   Expecting a String Array Scalar (for Java Char[]) Type in type ScalarHolder
+47| type Query              |   testCharArray: [String!]                                                                                                 |   Expecting a non null Stirng Array (for Java Char[]) Scalar Type in type Query
diff --git a/tcks/microprofile-graphql/src/main/resources/overrides/importantDatesUS/output.json b/tcks/microprofile-graphql/src/main/resources/overrides/importantDatesUS/output.json
@@ -0,0 +1,5 @@
+{
+    "data": {
+        "importantDatesUS": null
+    }
+}
diff --git a/tcks/microprofile-graphql/src/main/resources/overrides/trackLongLat/output.json b/tcks/microprofile-graphql/src/main/resources/overrides/trackLongLat/output.json
@@ -0,0 +1,5 @@
+{
+    "data": {
+        "trackHeroLongLat": null
+    }
+}