From 7ad971375d4b24592965258d7cb39cea2a1b3f25 Mon Sep 17 00:00:00 2001
From: Jan Martiska <jmartisk@redhat.com>
Date: Mon, 27 Mar 2023 10:12:19 +0200
Subject: [PATCH] Upgrade graphql-java to 20.1 and smallrye-graphql to 2.1.3

---
 bom/application/pom.xml                                   | 8 +++++++-
 .../graphql/deployment/SmallRyeGraphQLProcessor.java      | 1 +
 .../vertx/graphql/deployment/VertxGraphqlProcessor.java   | 1 +
 .../resources/overrides/invalidEnumValue/output2.json     | 2 +-
 4 files changed, 10 insertions(+), 2 deletions(-)

diff --git a/bom/application/pom.xml b/bom/application/pom.xml
index d9b1fc9a578ab..4cb759ae48169 100644
--- 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/extensions/smallrye-graphql/deployment/src/main/java/io/quarkus/smallrye/graphql/deployment/SmallRyeGraphQLProcessor.java b/extensions/smallrye-graphql/deployment/src/main/java/io/quarkus/smallrye/graphql/deployment/SmallRyeGraphQLProcessor.java
index 6aefe13e229c7..3888141529204 100644
--- a/extensions/smallrye-graphql/deployment/src/main/java/io/quarkus/smallrye/graphql/deployment/SmallRyeGraphQLProcessor.java
+++ b/extensions/smallrye-graphql/deployment/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/extensions/vertx-graphql/deployment/src/main/java/io/quarkus/vertx/graphql/deployment/VertxGraphqlProcessor.java b/extensions/vertx-graphql/deployment/src/main/java/io/quarkus/vertx/graphql/deployment/VertxGraphqlProcessor.java
index 59d642035b934..19cf2734691da 100644
--- a/extensions/vertx-graphql/deployment/src/main/java/io/quarkus/vertx/graphql/deployment/VertxGraphqlProcessor.java
+++ b/extensions/vertx-graphql/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
index a667fb5d6128f..1e1e1074ebc64 100644
--- 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,