Merge pull request #32262 from jmartisk/main-graphql-java-20.1

Upgrade graphql-java to 20.1 and smallrye-graphql 2.1.3
quarkusio · Apr 4, 2023 · 578da31 · 578da31
2 parents cb9ba98 + 7ad9713
commit 578da31
Show file tree

Hide file tree

Showing 4 changed files with 10 additions and 2 deletions.
diff --git a/bom/application/pom.xml b/bom/application/pom.xml
@@ -45,6 +45,7 @@
         <micrometer.version>1.10.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>20.1</graphql-java.version> <!-- keep in sync with smallrye-graphql -->
         <microprofile-config-api.version>3.0.2</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>
@@ -61,7 +62,7 @@
         <smallrye-health.version>4.0.1</smallrye-health.version>
         <smallrye-metrics.version>4.0.0</smallrye-metrics.version>
         <smallrye-open-api.version>3.3.2</smallrye-open-api.version>
-        <smallrye-graphql.version>2.1.2</smallrye-graphql.version>
+        <smallrye-graphql.version>2.1.3</smallrye-graphql.version> <!-- keep in sync with graphql-java -->
         <smallrye-opentracing.version>3.0.3</smallrye-opentracing.version>
         <smallrye-fault-tolerance.version>6.2.1</smallrye-fault-tolerance.version>
         <smallrye-jwt.version>4.2.1</smallrye-jwt.version>
@@ -3952,6 +3953,11 @@
                 <artifactId>smallrye-open-api-ui</artifactId>
                 <version>${smallrye-open-api.version}</version>
             </dependency>
+            <dependency>
+                <groupId>com.graphql-java</groupId>
+                <artifactId>graphql-java</artifactId>
+                <version>${graphql-java.version}</version>
+            </dependency>
             <dependency>
                 <groupId>io.smallrye</groupId>
                 <artifactId>smallrye-graphql</artifactId>

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
@@ -220,6 +220,7 @@ void registerNativeImageResources(BuildProducer<ServiceProviderBuildItem> servic
     void registerNativeResourceBundle(BuildProducer<NativeImageResourceBundleBuildItem> nativeResourceBundleProvider)
             throws IOException {
         nativeResourceBundleProvider.produce(new NativeImageResourceBundleBuildItem("i18n.Validation"));
+        nativeResourceBundleProvider.produce(new NativeImageResourceBundleBuildItem("i18n.Parsing"));
     }
 
     @BuildStep

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
@@ -50,6 +50,7 @@ List<ReflectiveClassBuildItem> registerForReflection() {
     void registerI18nResources(BuildProducer<NativeImageResourceBundleBuildItem> resourceBundle) {
         resourceBundle.produce(new NativeImageResourceBundleBuildItem("i18n/Execution"));
         resourceBundle.produce(new NativeImageResourceBundleBuildItem("i18n/General"));
+        resourceBundle.produce(new NativeImageResourceBundleBuildItem("i18n/Parsing"));
         resourceBundle.produce(new NativeImageResourceBundleBuildItem("i18n/Validation"));
     }
 

diff --git a/tcks/microprofile-graphql/src/main/resources/overrides/invalidEnumValue/output2.json b/tcks/microprofile-graphql/src/main/resources/overrides/invalidEnumValue/output2.json
@@ -1,7 +1,7 @@
 {
     "errors": [
         {
-            "message": "Validation error (WrongType@[createNewHero]) : argument 'hero.tshirtSize' with value 'EnumValue{name='XLTall'}' is not a valid 'ShirtSize' - Expected enum literal value not in allowable values -  'EnumValue{name='XLTall'}'.",
+            "message": "Validation error (WrongType@[createNewHero]) : argument 'hero.tshirtSize' with value 'EnumValue{name='XLTall'}' is not a valid 'ShirtSize' - Literal value not in allowable values for enum 'ShirtSize' - 'EnumValue{name='XLTall'}'",
             "locations": [
                 {
                     "line": 3,