Upgraded to graphql-java 12.0 which performs better in schemas that have deeply nested input object type definitions (#238)

- Refactored introspection builder to use the new graphql-java immutable AST builder APIs

Author: jimkyndemeyer

build.gradle

@@ -25,7 +25,7 @@ repositories {
 }
 
 dependencies {
-    compile ("com.graphql-java:graphql-java:11.0") {
+    compile ("com.graphql-java:graphql-java:12.0") {
         exclude group: "org.reactivestreams", module: "reactive-streams"
         exclude group: "com.graphql-java", module: "java-dataloader"
         exclude group: "org.slf4j", module: "slf4j-api"

src/main/com/intellij/lang/jsgraphql/ide/editor/GraphQLIntrospectionResultToSchema.java

@@ -57,40 +57,41 @@ public Document createSchemaDefinition(Map<String, Object> introspectionResult)
 
         Map<String, Object> queryType = (Map<String, Object>) schema.get("queryType");
         assertNotNull(queryType, "queryType expected");
-        TypeName query = new TypeName((String) queryType.get("name"));
+        TypeName query = TypeName.newTypeName().name((String) queryType.get("name")).build();
         boolean nonDefaultQueryName = !"Query".equals(query.getName());
 
-        SchemaDefinition schemaDefinition = SchemaDefinition.newSchemaDefinition().operationTypeDefinition(new OperationTypeDefinition("query", query)).build();
+        SchemaDefinition.Builder schemaDefinition = SchemaDefinition.newSchemaDefinition();
+        schemaDefinition.operationTypeDefinition(OperationTypeDefinition.newOperationTypeDefinition().name("query").typeName(query).build());
 
         Map<String, Object> mutationType = (Map<String, Object>) schema.get("mutationType");
         boolean nonDefaultMutationName = false;
         if (mutationType != null) {
-            TypeName mutation = new TypeName((String) mutationType.get("name"));
+            TypeName mutation = TypeName.newTypeName().name((String) mutationType.get("name")).build();
             nonDefaultMutationName = !"Mutation".equals(mutation.getName());
-            schemaDefinition.getOperationTypeDefinitions().add(new OperationTypeDefinition("mutation", mutation));
+            schemaDefinition.operationTypeDefinition(OperationTypeDefinition.newOperationTypeDefinition().name("mutation").typeName(mutation).build());
         }
 
         Map<String, Object> subscriptionType = (Map<String, Object>) schema.get("subscriptionType");
         boolean nonDefaultSubscriptionName = false;
         if (subscriptionType != null) {
-            TypeName subscription = new TypeName((String) subscriptionType.get("name"));
+            TypeName subscription = TypeName.newTypeName().name(((String) subscriptionType.get("name"))).build();
             nonDefaultSubscriptionName = !"Subscription".equals(subscription.getName());
-            schemaDefinition.getOperationTypeDefinitions().add(new OperationTypeDefinition("subscription", subscription));
+            schemaDefinition.operationTypeDefinition(OperationTypeDefinition.newOperationTypeDefinition().name("subscription").typeName(subscription).build());
         }
 
-        Document document = new Document(Lists.newArrayList());
+        Document.Builder document = Document.newDocument();
         if (nonDefaultQueryName || nonDefaultMutationName || nonDefaultSubscriptionName) {
-            document.getDefinitions().add(schemaDefinition);
+            document.definition(schemaDefinition.build());
         }
 
         List<Map<String, Object>> types = (List<Map<String, Object>>) schema.get("types");
         for (Map<String, Object> type : types) {
             TypeDefinition typeDefinition = createTypeDefinition(type);
             if (typeDefinition == null) continue;
-            document.getDefinitions().add(typeDefinition);
+            document.definition(typeDefinition);
         }
 
-        return document;
+        return document.build();
     }
 
     private TypeDefinition createTypeDefinition(Map<String, Object> type) {
@@ -272,11 +273,11 @@ private Type createTypeIndirection(Map<String, Object> type) {
             case "ENUM":
             case "INPUT_OBJECT":
             case "SCALAR":
-                return new TypeName((String) type.get("name"));
+                return TypeName.newTypeName().name((String) type.get("name")).build();
             case "NON_NULL":
-                return new NonNullType(createTypeIndirection((Map<String, Object>) type.get("ofType")));
+                return NonNullType.newNonNullType().type(createTypeIndirection((Map<String, Object>) type.get("ofType"))).build();
             case "LIST":
-                return new ListType(createTypeIndirection((Map<String, Object>) type.get("ofType")));
+                return ListType.newListType().type(createTypeIndirection((Map<String, Object>) type.get("ofType"))).build();
             default:
                 return assertShouldNeverHappen("Unknown kind %s", kind);
         }

src/main/com/intellij/lang/jsgraphql/utils/GraphQLUtil.java

@@ -10,6 +10,7 @@
 import graphql.language.Document;
 import graphql.language.SourceLocation;
 import graphql.parser.GraphqlAntlrToLanguage;
+import graphql.parser.MultiSourceReader;
 import graphql.parser.antlr.GraphqlLexer;
 import graphql.parser.antlr.GraphqlParser;
 import graphql.schema.GraphQLModifiedType;
@@ -68,8 +69,12 @@ public static Document parseDocument(String input, String sourceName, int lineDe
         parser.setErrorHandler(new BailErrorStrategy());
         GraphqlParser.DocumentContext documentContext = parser.document();
 
+        MultiSourceReader multiSourceReader = MultiSourceReader.newMultiSourceReader()
+                .string(input, sourceName)
+                .trackData(true)
+                .build();
 
-        GraphqlAntlrToLanguage antlrToLanguage = new GraphqlAntlrToLanguage(tokens) {
+        GraphqlAntlrToLanguage antlrToLanguage = new GraphqlAntlrToLanguage(tokens, multiSourceReader) {
             @Override
             protected SourceLocation getSourceLocation(ParserRuleContext parserRuleContext) {
                 Token startToken = parserRuleContext.getStart();