From 87494c7fc884296c1f02f5e5de161c43f21bb8cc Mon Sep 17 00:00:00 2001
From: BURJA Lucian <vasile-lucian.burja@consilium.europa.eu>
Date: Tue, 21 Jan 2020 15:49:06 +0100
Subject: [PATCH 1/2] Upgrade to graphql-java 14.0

---
 pom.xml                                                      | 2 +-
 src/main/kotlin/com/coxautodev/graphql/tools/SchemaParser.kt | 3 ++-
 2 files changed, 3 insertions(+), 2 deletions(-)

diff --git a/pom.xml b/pom.xml
index b2d8ed8c..f18ccf89 100644
--- a/pom.xml
+++ b/pom.xml
@@ -17,7 +17,7 @@
         <kotlin.version>1.3.31</kotlin.version>
         <kotlin-coroutines.version>1.2.1</kotlin-coroutines.version>
         <jackson.version>2.10.0</jackson.version>
-        <graphql-java.version>13.0</graphql-java.version>
+        <graphql-java.version>14.0</graphql-java.version>
 
         <maven.compiler.source>${java.version}</maven.compiler.source>
         <maven.compiler.target>${java.version}</maven.compiler.target>
diff --git a/src/main/kotlin/com/coxautodev/graphql/tools/SchemaParser.kt b/src/main/kotlin/com/coxautodev/graphql/tools/SchemaParser.kt
index 8521205a..b546a12e 100644
--- a/src/main/kotlin/com/coxautodev/graphql/tools/SchemaParser.kt
+++ b/src/main/kotlin/com/coxautodev/graphql/tools/SchemaParser.kt
@@ -128,7 +128,8 @@ class SchemaParser internal constructor(scanResult: ScannedSchemaObjects, privat
 
         val additionalObjects = objects.filter { o -> o != query && o != subscription && o != mutation }
 
-        return SchemaObjects(query, mutation, subscription, (additionalObjects + inputObjects + enums + interfaces + unions).toSet(), codeRegistryBuilder)
+        @Suppress("UNCHECKED_CAST") val dictionary = (additionalObjects + inputObjects + enums + interfaces + unions).toSet() as Set<GraphQLType>
+        return SchemaObjects(query, mutation, subscription, dictionary, codeRegistryBuilder)
     }
 
     /**

From a6107f5fbab3ccda99acd6e626ec38fb1317a2bd Mon Sep 17 00:00:00 2001
From: Lucian Burja <vasile-lucian.burja@consilium.europa.eu>
Date: Wed, 22 Jan 2020 07:16:40 +0100
Subject: [PATCH 2/2] Remove UNCHECKED_CAST

---
 src/main/kotlin/com/coxautodev/graphql/tools/SchemaParser.kt | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/src/main/kotlin/com/coxautodev/graphql/tools/SchemaParser.kt b/src/main/kotlin/com/coxautodev/graphql/tools/SchemaParser.kt
index b546a12e..0a750687 100644
--- a/src/main/kotlin/com/coxautodev/graphql/tools/SchemaParser.kt
+++ b/src/main/kotlin/com/coxautodev/graphql/tools/SchemaParser.kt
@@ -128,8 +128,8 @@ class SchemaParser internal constructor(scanResult: ScannedSchemaObjects, privat
 
         val additionalObjects = objects.filter { o -> o != query && o != subscription && o != mutation }
 
-        @Suppress("UNCHECKED_CAST") val dictionary = (additionalObjects + inputObjects + enums + interfaces + unions).toSet() as Set<GraphQLType>
-        return SchemaObjects(query, mutation, subscription, dictionary, codeRegistryBuilder)
+        val types = (additionalObjects.toSet() as Set<GraphQLType>) + inputObjects + enums + interfaces + unions
+        return SchemaObjects(query, mutation, subscription, types, codeRegistryBuilder)
     }
 
     /**