feat: update graphql-java 19.1 (#1519)

* feat: update graphql-java 19.1 * feat: graphql java directive skip removed unneded quote Co-authored-by: samvazquez <[email protected]>
ExpediaGroup · Aug 16, 2022 · 4293777 · 4293777
1 parent dc3f845
commit 4293777
Show file tree

Hide file tree

Showing 23 changed files with 25 additions and 25 deletions.
diff --git a/examples/client/src/integration/wiremock/__files/schema.graphql b/examples/client/src/integration/wiremock/__files/schema.graphql
@@ -42,7 +42,7 @@ directive @requires(fields: _FieldSet!) on FIELD_DEFINITION
 "Indicates that given object and/or field can be resolved by multiple subgraphs"
 directive @shareable on OBJECT | FIELD_DEFINITION
 
-"Directs the executor to skip this field or fragment when the `if`'argument is true."
+"Directs the executor to skip this field or fragment when the `if` argument is true."
 directive @skip(
     "Skipped when true."
     if: Boolean!

diff --git a/...test/kotlin/com/expediagroup/graphql/generator/federation/FederatedSchemaGeneratorTest.kt b/...test/kotlin/com/expediagroup/graphql/generator/federation/FederatedSchemaGeneratorTest.kt
@@ -66,7 +66,7 @@ class FederatedSchemaGeneratorTest {
             "Specifies required input field set from the base type for a resolver"
             directive @requires(fields: _FieldSet!) on FIELD_DEFINITION
 
-            "Directs the executor to skip this field or fragment when the `if`'argument is true."
+            "Directs the executor to skip this field or fragment when the `if` argument is true."
             directive @skip(
                 "Skipped when true."
                 if: Boolean!
@@ -180,7 +180,7 @@ class FederatedSchemaGeneratorTest {
             "Specifies required input field set from the base type for a resolver"
             directive @requires(fields: _FieldSet!) on FIELD_DEFINITION
 
-            "Directs the executor to skip this field or fragment when the `if`'argument is true."
+            "Directs the executor to skip this field or fragment when the `if` argument is true."
             directive @skip(
                 "Skipped when true."
                 if: Boolean!

diff --git a/...st/kotlin/com/expediagroup/graphql/generator/federation/FederatedSchemaV2GeneratorTest.kt b/...st/kotlin/com/expediagroup/graphql/generator/federation/FederatedSchemaV2GeneratorTest.kt
@@ -75,7 +75,7 @@ class FederatedSchemaV2GeneratorTest {
             "Indicates that given object and/or field can be resolved by multiple subgraphs"
             directive @shareable on OBJECT | FIELD_DEFINITION
 
-            "Directs the executor to skip this field or fragment when the `if`'argument is true."
+            "Directs the executor to skip this field or fragment when the `if` argument is true."
             directive @skip(
                 "Skipped when true."
                 if: Boolean!

diff --git a/.../test/kotlin/com/expediagroup/graphql/generator/extensions/GraphQLSchemaExtensionsTest.kt b/.../test/kotlin/com/expediagroup/graphql/generator/extensions/GraphQLSchemaExtensionsTest.kt
@@ -270,7 +270,7 @@ class GraphQLSchemaExtensionsTest {
                     if: Boolean!
                   ) on FIELD | FRAGMENT_SPREAD | INLINE_FRAGMENT
 
-                "Directs the executor to skip this field or fragment when the `if`'argument is true."
+                "Directs the executor to skip this field or fragment when the `if` argument is true."
                 directive @skip(
                     "Skipped when true."
                     if: Boolean!

diff --git a/gradle.properties b/gradle.properties
@@ -23,7 +23,7 @@ kotlinxSerializationVersion = 1.3.2
 androidPluginVersion = 7.1.2
 classGraphVersion = 4.8.149
 federationGraphQLVersion = 2.0.4
-graphQLJavaVersion = 19.0
+graphQLJavaVersion = 19.1
 graphQLJavaDataLoaderVersion = 3.2.0
 jacksonVersion = 2.13.3
 # KotlinPoet v1.12.0+ requires Kotlin v1.7

diff --git a/...nt-generator/src/test/kotlin/com/expediagroup/graphql/plugin/client/DownloadSchemaTest.kt b/...nt-generator/src/test/kotlin/com/expediagroup/graphql/plugin/client/DownloadSchemaTest.kt
@@ -56,7 +56,7 @@ class DownloadSchemaTest {
                     if: Boolean!
                   ) on FIELD | FRAGMENT_SPREAD | INLINE_FRAGMENT
 
-                "Directs the executor to skip this field or fragment when the `if`'argument is true."
+                "Directs the executor to skip this field or fragment when the `if` argument is true."
                 directive @skip(
                     "Skipped when true."
                     if: Boolean!

diff --git a/...-generator/src/test/kotlin/com/expediagroup/graphql/plugin/client/IntrospectSchemaTest.kt b/...-generator/src/test/kotlin/com/expediagroup/graphql/plugin/client/IntrospectSchemaTest.kt
@@ -59,7 +59,7 @@ class IntrospectSchemaTest {
                     if: Boolean!
                   ) on FIELD | FRAGMENT_SPREAD | INLINE_FRAGMENT
 
-                "Directs the executor to skip this field or fragment when the `if`'argument is true."
+                "Directs the executor to skip this field or fragment when the `if` argument is true."
                 directive @skip(
                     "Skipped when true."
                     if: Boolean!

diff --git a/plugins/client/graphql-kotlin-client-generator/src/test/resources/introspectionResult.json b/plugins/client/graphql-kotlin-client-generator/src/test/resources/introspectionResult.json
@@ -948,7 +948,7 @@
         },
         {
           "name": "skip",
-          "description": "Directs the executor to skip this field or fragment when the `if`'argument is true.",
+          "description": "Directs the executor to skip this field or fragment when the `if` argument is true.",
           "locations": [
             "FIELD",
             "FRAGMENT_SPREAD",

diff --git a/plugins/client/graphql-kotlin-client-generator/src/test/resources/testSchema.graphql b/plugins/client/graphql-kotlin-client-generator/src/test/resources/testSchema.graphql
@@ -7,7 +7,7 @@ directive @include(
   "Included when true."
   if: Boolean!
 ) on FIELD | FRAGMENT_SPREAD | INLINE_FRAGMENT
-"Directs the executor to skip this field or fragment when the `if`'argument is true."
+"Directs the executor to skip this field or fragment when the `if` argument is true."
 directive @skip(
   "Skipped when true."
   if: Boolean!

diff --git a/...phql-kotlin-gradle-plugin/src/integration/android/androidGraphQLClient/app/schema.graphql b/...phql-kotlin-gradle-plugin/src/integration/android/androidGraphQLClient/app/schema.graphql
@@ -7,7 +7,7 @@ directive @include(
   "Included when true."
   if: Boolean!
 ) on FIELD | FRAGMENT_SPREAD | INLINE_FRAGMENT
-"Directs the executor to skip this field or fragment when the `if`'argument is true."
+"Directs the executor to skip this field or fragment when the `if` argument is true."
 directive @skip(
   "Skipped when true."
   if: Boolean!

diff --git a/plugins/graphql-kotlin-gradle-plugin/src/integration/client-generator/jacoco/schema.graphql b/plugins/graphql-kotlin-gradle-plugin/src/integration/client-generator/jacoco/schema.graphql
@@ -7,7 +7,7 @@ directive @include(
   "Included when true."
   if: Boolean!
 ) on FIELD | FRAGMENT_SPREAD | INLINE_FRAGMENT
-"Directs the executor to skip this field or fragment when the `if`'argument is true."
+"Directs the executor to skip this field or fragment when the `if` argument is true."
 directive @skip(
   "Skipped when true."
   if: Boolean!

diff --git a/...le-plugin/src/test/kotlin/com/expediagroup/graphql/plugin/gradle/GraphQLGradlePluginIT.kt b/...le-plugin/src/test/kotlin/com/expediagroup/graphql/plugin/gradle/GraphQLGradlePluginIT.kt
@@ -547,7 +547,7 @@ class GraphQLGradlePluginIT : GraphQLGradlePluginAbstractIT() {
             "Specifies required input field set from the base type for a resolver"
             directive @requires(fields: _FieldSet!) on FIELD_DEFINITION
 
-            "Directs the executor to skip this field or fragment when the `if`'argument is true."
+            "Directs the executor to skip this field or fragment when the `if` argument is true."
             directive @skip(
                 "Skipped when true."
                 if: Boolean!

diff --git a/.../src/test/kotlin/com/expediagroup/graphql/plugin/gradle/tasks/GraphQLGenerateSDLTaskIT.kt b/.../src/test/kotlin/com/expediagroup/graphql/plugin/gradle/tasks/GraphQLGenerateSDLTaskIT.kt
@@ -46,7 +46,7 @@ internal val DEFAULT_SCHEMA =
         if: Boolean!
       ) on FIELD | FRAGMENT_SPREAD | INLINE_FRAGMENT
 
-    "Directs the executor to skip this field or fragment when the `if`'argument is true."
+    "Directs the executor to skip this field or fragment when the `if` argument is true."
     directive @skip(
         "Skipped when true."
         if: Boolean!
@@ -96,7 +96,7 @@ internal val FEDERATED_SCHEMA =
     "Specifies required input field set from the base type for a resolver"
     directive @requires(fields: _FieldSet!) on FIELD_DEFINITION
 
-    "Directs the executor to skip this field or fragment when the `if`'argument is true."
+    "Directs the executor to skip this field or fragment when the `if` argument is true."
     directive @skip(
         "Skipped when true."
         if: Boolean!

diff --git a/plugins/graphql-kotlin-gradle-plugin/src/test/resources/mocks/IntrospectionResult.json b/plugins/graphql-kotlin-gradle-plugin/src/test/resources/mocks/IntrospectionResult.json
@@ -1744,7 +1744,7 @@
         },
         {
           "name": "skip",
-          "description": "Directs the executor to skip this field or fragment when the `if`'argument is true.",
+          "description": "Directs the executor to skip this field or fragment when the `if` argument is true.",
           "locations": [
             "FIELD",
             "FRAGMENT_SPREAD",

diff --git a/plugins/graphql-kotlin-gradle-plugin/src/test/resources/mocks/schema.graphql b/plugins/graphql-kotlin-gradle-plugin/src/test/resources/mocks/schema.graphql
@@ -7,7 +7,7 @@ directive @include(
   "Included when true."
   if: Boolean!
 ) on FIELD | FRAGMENT_SPREAD | INLINE_FRAGMENT
-"Directs the executor to skip this field or fragment when the `if`'argument is true."
+"Directs the executor to skip this field or fragment when the `if` argument is true."
 directive @skip(
   "Skipped when true."
   if: Boolean!

diff --git a/...dl-federated/src/test/kotlin/com/expediagroup/graphql/plugin/maven/GenerateSDLMojoTest.kt b/...dl-federated/src/test/kotlin/com/expediagroup/graphql/plugin/maven/GenerateSDLMojoTest.kt
@@ -67,7 +67,7 @@ class GenerateSDLMojoTest {
             "Specifies required input field set from the base type for a resolver"
             directive @requires(fields: _FieldSet!) on FIELD_DEFINITION
 
-            "Directs the executor to skip this field or fragment when the `if`'argument is true."
+            "Directs the executor to skip this field or fragment when the `if` argument is true."
             directive @skip(
                 "Skipped when true."
                 if: Boolean!

diff --git a/...te-sdl-hooks/src/test/kotlin/com/expediagroup/graphql/plugin/maven/GenerateSDLMojoTest.kt b/...te-sdl-hooks/src/test/kotlin/com/expediagroup/graphql/plugin/maven/GenerateSDLMojoTest.kt
@@ -67,7 +67,7 @@ class GenerateSDLMojoTest {
             "Specifies required input field set from the base type for a resolver"
             directive @requires(fields: _FieldSet!) on FIELD_DEFINITION
 
-            "Directs the executor to skip this field or fragment when the `if`'argument is true."
+            "Directs the executor to skip this field or fragment when the `if` argument is true."
             directive @skip(
                 "Skipped when true."
                 if: Boolean!

diff --git a/...generate-sdl/src/test/kotlin/com/expediagroup/graphql/plugin/maven/GenerateSDLMojoTest.kt b/...generate-sdl/src/test/kotlin/com/expediagroup/graphql/plugin/maven/GenerateSDLMojoTest.kt
@@ -52,7 +52,7 @@ class GenerateSDLMojoTest {
                 if: Boolean!
               ) on FIELD | FRAGMENT_SPREAD | INLINE_FRAGMENT
 
-            "Directs the executor to skip this field or fragment when the `if`'argument is true."
+            "Directs the executor to skip this field or fragment when the `if` argument is true."
             directive @skip(
                 "Skipped when true."
                 if: Boolean!

diff --git a/...ins/graphql-kotlin-maven-plugin/src/integration/wiremock/__files/introspectionResult.json b/...ins/graphql-kotlin-maven-plugin/src/integration/wiremock/__files/introspectionResult.json
@@ -1768,7 +1768,7 @@
         },
         {
           "name": "skip",
-          "description": "Directs the executor to skip this field or fragment when the `if`'argument is true.",
+          "description": "Directs the executor to skip this field or fragment when the `if` argument is true.",
           "locations": [
             "FIELD",
             "FRAGMENT_SPREAD",

diff --git a/plugins/graphql-kotlin-maven-plugin/src/integration/wiremock/__files/testSchema.graphql b/plugins/graphql-kotlin-maven-plugin/src/integration/wiremock/__files/testSchema.graphql
@@ -7,7 +7,7 @@ directive @include(
   "Included when true."
   if: Boolean!
 ) on FIELD | FRAGMENT_SPREAD | INLINE_FRAGMENT
-"Directs the executor to skip this field or fragment when the `if`'argument is true."
+"Directs the executor to skip this field or fragment when the `if` argument is true."
 directive @skip(
   "Skipped when true."
   if: Boolean!

diff --git a/...rc/integrationTest/kotlin/com/expediagroup/graphql/plugin/schema/GenerateCustomSDLTest.kt b/...rc/integrationTest/kotlin/com/expediagroup/graphql/plugin/schema/GenerateCustomSDLTest.kt
@@ -56,7 +56,7 @@ class GenerateCustomSDLTest {
                 "Specifies required input field set from the base type for a resolver"
                 directive @requires(fields: _FieldSet!) on FIELD_DEFINITION
 
-                "Directs the executor to skip this field or fragment when the `if`'argument is true."
+                "Directs the executor to skip this field or fragment when the `if` argument is true."
                 directive @skip(
                     "Skipped when true."
                     if: Boolean!

diff --git a/...n-sdl-generator/src/test/kotlin/com/expediagroup/graphql/plugin/schema/GenerateSDLTest.kt b/...n-sdl-generator/src/test/kotlin/com/expediagroup/graphql/plugin/schema/GenerateSDLTest.kt
@@ -42,7 +42,7 @@ class GenerateSDLTest {
                     if: Boolean!
                   ) on FIELD | FRAGMENT_SPREAD | INLINE_FRAGMENT
 
-                "Directs the executor to skip this field or fragment when the `if`'argument is true."
+                "Directs the executor to skip this field or fragment when the `if` argument is true."
                 directive @skip(
                     "Skipped when true."
                     if: Boolean!

diff --git a/...ver/src/test/kotlin/com/expediagroup/graphql/server/spring/routes/RouteConfigurationIT.kt b/...ver/src/test/kotlin/com/expediagroup/graphql/server/spring/routes/RouteConfigurationIT.kt
@@ -84,7 +84,7 @@ class RouteConfigurationIT(@Autowired private val testClient: WebTestClient) {
             if: Boolean!
           ) on FIELD | FRAGMENT_SPREAD | INLINE_FRAGMENT
 
-        "Directs the executor to skip this field or fragment when the `if`'argument is true."
+        "Directs the executor to skip this field or fragment when the `if` argument is true."
         directive @skip(
             "Skipped when true."
             if: Boolean!