update to graphql-java 15.0 (#731)

* update to graphql-java 15.0

* fix example spring app

Author: dariuszkuc

examples/spring/src/main/kotlin/com/expediagroup/graphql/examples/directives/LowercaseSchemaDirectiveWiring.kt

@@ -28,7 +28,7 @@ class LowercaseSchemaDirectiveWiring : KotlinSchemaDirectiveWiring {
 
     override fun onField(environment: KotlinFieldDirectiveEnvironment): GraphQLFieldDefinition {
         val field = environment.element
-        val originalDataFetcher: DataFetcher<Any> = environment.getDataFetcher()
+        val originalDataFetcher: DataFetcher<*> = environment.getDataFetcher()
 
         val lowerCaseFetcher = DataFetcherFactories.wrapDataFetcher(
             originalDataFetcher,

examples/spring/src/main/kotlin/com/expediagroup/graphql/examples/directives/SpecificValueOnlySchemaDirectiveWiring.kt

@@ -26,7 +26,7 @@ class SpecificValueOnlySchemaDirectiveWiring : KotlinSchemaDirectiveWiring {
     @Throws(RuntimeException::class)
     override fun onField(environment: KotlinFieldDirectiveEnvironment): GraphQLFieldDefinition {
         val field = environment.element
-        val originalDataFetcher: DataFetcher<Any> = environment.getDataFetcher()
+        val originalDataFetcher: DataFetcher<*> = environment.getDataFetcher()
 
         val supportedValue = environment.directive.getArgument("value")?.value?.toString() ?: ""
 

examples/spring/src/main/kotlin/com/expediagroup/graphql/examples/directives/StringEvalSchemaDirectiveWiring.kt

@@ -29,7 +29,7 @@ class StringEvalSchemaDirectiveWiring : KotlinSchemaDirectiveWiring {
 
     override fun onField(environment: KotlinFieldDirectiveEnvironment): GraphQLFieldDefinition {
         val field = environment.element
-        val originalDataFetcher: DataFetcher<Any> = environment.getDataFetcher()
+        val originalDataFetcher: DataFetcher<*> = environment.getDataFetcher()
 
         val defaultValueFetcher = DataFetcher<Any> { dataEnv ->
             val newArguments = HashMap(dataEnv.arguments)

gradle.properties

@@ -19,7 +19,7 @@ kotlinVersion = 1.3.71
 kotlinCoroutinesVersion = 1.3.5
 
 classGraphVersion = 4.8.78
-graphQLJavaVersion = 14.0
+graphQLJavaVersion = 15.0
 jacksonVersion = 2.10.2
 kotlinPoetVersion = 1.4.1
 ktorVersion = 1.3.1

graphql-kotlin-federation/src/main/kotlin/com/expediagroup/graphql/federation/FederatedSchemaGeneratorHooks.kt

@@ -54,7 +54,7 @@ import kotlin.reflect.full.findAnnotation
 open class FederatedSchemaGeneratorHooks(private val federatedTypeRegistry: FederatedTypeRegistry) : SchemaGeneratorHooks {
     private val directiveDefinitionRegex = "(^\".+\"$[\\r\\n])?^directive @\\w+\\(.+\\) on .+?\$[\\r\\n]*".toRegex(setOf(RegexOption.MULTILINE, RegexOption.IGNORE_CASE, RegexOption.DOT_MATCHES_ALL))
     private val scalarDefinitionRegex = "(^\".+\"$[\\r\\n])?^scalar (_FieldSet|_Any)$[\\r\\n]*".toRegex(setOf(RegexOption.MULTILINE, RegexOption.IGNORE_CASE))
-    private val emptyQueryRegex = "^type Query \\{$\\s+^\\}$\\s+".toRegex(setOf(RegexOption.MULTILINE, RegexOption.IGNORE_CASE))
+    private val emptyQueryRegex = "^type Query(?!\\s*\\{)\\s+".toRegex(setOf(RegexOption.MULTILINE, RegexOption.IGNORE_CASE))
     private val validator = FederatedSchemaValidator()
 
     private val federatedDirectiveTypes: List<GraphQLDirective> = listOf(EXTERNAL_DIRECTIVE_TYPE, REQUIRES_DIRECTIVE_TYPE, PROVIDES_DIRECTIVE_TYPE, KEY_DIRECTIVE_TYPE, EXTENDS_DIRECTIVE_TYPE)

graphql-kotlin-federation/src/test/kotlin/com/expediagroup/graphql/federation/FederatedSchemaGeneratorTest.kt

@@ -64,9 +64,15 @@ directive @requires(fields: _FieldSet!) on FIELD_DEFINITION
 "Marks the field or enum value as deprecated"
 directive @deprecated(
     "The reason for the deprecation"
-    reason: String! = "No longer supported"
+    reason: String = "No longer supported"
   ) on FIELD_DEFINITION | ENUM_VALUE
 
+"Exposes a URL that specifies the behaviour of this scalar."
+directive @specifiedBy(
+    "The URL that specifies the behaviour of this scalar."
+    url: String!
+  ) on SCALAR
+
 interface Product @extends @key(fields : "id") {
   id: String! @external
   reviews: [Review!]!
@@ -156,9 +162,15 @@ class FederatedSchemaGeneratorTest {
             "Marks the field or enum value as deprecated"
             directive @deprecated(
                 "The reason for the deprecation"
-                reason: String! = "No longer supported"
+                reason: String = "No longer supported"
               ) on FIELD_DEFINITION | ENUM_VALUE
 
+            "Exposes a URL that specifies the behaviour of this scalar."
+            directive @specifiedBy(
+                "The URL that specifies the behaviour of this scalar."
+                url: String!
+              ) on SCALAR
+
             "Marks target field as external meaning it will be resolved by federated schema"
             directive @external on FIELD_DEFINITION
 

graphql-kotlin-federation/src/test/kotlin/com/expediagroup/graphql/federation/types/AnyTest.kt

@@ -41,7 +41,7 @@ class AnyTest {
     fun `_Any scalar should allow all types`() {
         val coercing = ANY_SCALAR_TYPE.coercing
 
-        assertNull(coercing.parseLiteral(NullValue.Null))
+        assertNull(coercing.parseLiteral(NullValue.newNullValue().build()))
         assertEquals(expected = BigDecimal.ONE, actual = coercing.parseLiteral(FloatValue(BigDecimal.ONE)))
         assertEquals(expected = "hello", actual = coercing.parseLiteral(StringValue("hello")))
         assertEquals(expected = BigInteger.ONE, actual = coercing.parseLiteral(IntValue(BigInteger.ONE)))

graphql-kotlin-schema-generator/src/main/kotlin/com/expediagroup/graphql/directives/KotlinFieldDirectiveEnvironment.kt

@@ -35,7 +35,7 @@ class KotlinFieldDirectiveEnvironment(
     /**
      * Retrieve current data fetcher associated with the target element.
      */
-    fun getDataFetcher(): DataFetcher<Any> = codeRegistry.getDataFetcher(coordinates, element)
+    fun getDataFetcher(): DataFetcher<*> = codeRegistry.getDataFetcher(coordinates, element)
 
     /**
      * Update target element data fetcher.

graphql-kotlin-schema-generator/src/main/kotlin/com/expediagroup/graphql/extensions/GraphQLSchemaExtensions.kt

@@ -26,8 +26,6 @@ import java.util.function.Predicate
  *
  * @param includeIntrospectionTypes boolean flag indicating whether SDL should include introspection types
  * @param includeScalarTypes boolean flag indicating whether SDL should include custom schema scalars
- * @param includeExtendedScalarTypes boolean flag indicating whether SDL should include extended scalars (e.g. Long)
- *   supported by graphql-java, if set will automatically also set the includeScalarTypes flag
  * @param includeDefaultSchemaDefinition boolean flag indicating whether SDL should include schema definition if using
  *   default root type names
  * @param includeDirectives boolean flag indicating whether SDL should include directive information
@@ -36,22 +34,17 @@ import java.util.function.Predicate
 fun GraphQLSchema.print(
     includeIntrospectionTypes: Boolean = false,
     includeScalarTypes: Boolean = true,
-    includeExtendedScalarTypes: Boolean = true,
     includeDefaultSchemaDefinition: Boolean = true,
     includeDirectives: Boolean = true,
     includeDirectivesFilter: Predicate<GraphQLDirective> = Predicate { includeDirectives }
 ): String {
     val schemaPrinter = SchemaPrinter(
         SchemaPrinter.Options.defaultOptions()
             .includeIntrospectionTypes(includeIntrospectionTypes)
-            .includeScalarTypes(includeScalarTypes || includeExtendedScalarTypes)
-            .includeExtendedScalarTypes(includeExtendedScalarTypes)
+            .includeScalarTypes(includeScalarTypes)
             .includeSchemaDefinition(includeDefaultSchemaDefinition)
             .includeDirectives(includeDirectives)
             .includeDirectives(includeDirectivesFilter)
     )
-
-    // escape special characters to preserve them in the SDL
     return schemaPrinter.print(this)
-        .replace("\\", "\\\\")
 }

graphql-kotlin-schema-generator/src/test/kotlin/com/expediagroup/graphql/extensions/GraphQLSchemaExtensionsTest.kt

@@ -58,29 +58,11 @@ class GraphQLSchemaExtensionsTest {
         assertEquals(expected, sdl)
     }
 
-    @Test
-    fun `verify print result of a simple schema with extended scalars`() {
-        val schema: GraphQLSchema = toSchema(queries = listOf(TopLevelObject(SimpleQuery())), config = testSchemaConfig)
-
-        val sdl = schema.print(includeDirectives = false, includeScalarTypes = false, includeExtendedScalarTypes = true).trim()
-        val expected = """
-            schema {
-              query: Query
-            }
-
-            type Query {
-              basic(msg: String!): String!
-              nullable(msg: String): String
-            }
-        """.trimIndent()
-        assertEquals(expected, sdl)
-    }
-
     @Test
     fun `verify print result of a simple schema with no scalars`() {
         val schema: GraphQLSchema = toSchema(queries = listOf(TopLevelObject(SimpleQuery())), config = testSchemaConfig)
 
-        val sdl = schema.print(includeDirectives = false, includeScalarTypes = false, includeExtendedScalarTypes = false).trim()
+        val sdl = schema.print(includeDirectives = false, includeScalarTypes = false).trim()
         val expected = """
             schema {
               query: Query
@@ -283,9 +265,15 @@ class GraphQLSchemaExtensionsTest {
             "Marks the field or enum value as deprecated"
             directive @deprecated(
                 "The reason for the deprecation"
-                reason: String! = "No longer supported"
+                reason: String = "No longer supported"
               ) on FIELD_DEFINITION | ENUM_VALUE
 
+            "Exposes a URL that specifies the behaviour of this scalar."
+            directive @specifiedBy(
+                "The URL that specifies the behaviour of this scalar."
+                url: String!
+              ) on SCALAR
+
             type ClassWithDirective {
               msg: String! @customDirective
             }