Ensured scalar SDL printing includes all scalars, fixed enum and union definition builders (was using getters to add to new lists that were ignored) (#164)

Author: jimkyndemeyer

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

@@ -168,10 +168,10 @@ public String printIntrospectionJsonAsGraphQL(String introspectionJson) {
             }
         }
         final Document schemaDefinition = new GraphQLIntrospectionResultToSchema().createSchemaDefinition(introspectionAsMap);
-        final SchemaPrinter.Options options = SchemaPrinter.Options.defaultOptions().includeScalarTypes(true).includeSchemaDefintion(true);
+        final SchemaPrinter.Options options = SchemaPrinter.Options.defaultOptions().includeScalarTypes(false).includeSchemaDefintion(true);
         final StringBuilder sb = new StringBuilder(new SchemaPrinter(options).print(schemaDefinition));
 
-        // graphql-java currently appears to discard custom scalars as part of the schema that the printer constructs, so include them manually here
+        // graphql-java only prints scalars that are used by fields since it visits fields to discover types, so add the scalars here manually
         final Set<String> knownScalars = Sets.newHashSet();
         for (Node definition : schemaDefinition.getChildren()) {
             if (definition instanceof ScalarTypeDefinition) {

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

@@ -128,32 +128,26 @@ private TypeDefinition createScalar(Map<String, Object> input) {
     UnionTypeDefinition createUnion(Map<String, Object> input) {
         assertTrue(input.get("kind").equals("UNION"), "wrong input");
 
-        UnionTypeDefinition unionTypeDefinition = UnionTypeDefinition.newUnionTypeDefinition()
-                .name((String) input.get("name"))
-                .description(getDescription(input))
-                .build();
-
-        List<Map<String, Object>> possibleTypes = (List<Map<String, Object>>) input.get("possibleTypes");
-
+        final List<Map<String, Object>> possibleTypes = (List<Map<String, Object>>) input.get("possibleTypes");
+        final List<Type> memberTypes = Lists.newArrayList();
         for (Map<String, Object> possibleType : possibleTypes) {
             TypeName typeName = new TypeName((String) possibleType.get("name"));
-            unionTypeDefinition.getMemberTypes().add(typeName);
+            memberTypes.add(typeName);
         }
 
-        return unionTypeDefinition;
+        return UnionTypeDefinition.newUnionTypeDefinition()
+                .name((String) input.get("name"))
+                .description(getDescription(input))
+                .memberTypes(memberTypes)
+                .build();
     }
 
     @SuppressWarnings("unchecked")
     EnumTypeDefinition createEnum(Map<String, Object> input) {
         assertTrue(input.get("kind").equals("ENUM"), "wrong input");
 
-        EnumTypeDefinition enumTypeDefinition = EnumTypeDefinition.newEnumTypeDefinition()
-                .name((String) input.get("name"))
-                .description(getDescription(input))
-                .build();
-
-        List<Map<String, Object>> enumValues = (List<Map<String, Object>>) input.get("enumValues");
-
+        final List<Map<String, Object>> enumValues = (List<Map<String, Object>>) input.get("enumValues");
+        final List<EnumValueDefinition> enumValueDefinitions = Lists.newArrayList();
         for (Map<String, Object> enumValue : enumValues) {
 
             EnumValueDefinition enumValueDefinition = EnumValueDefinition.newEnumValueDefinition()
@@ -162,10 +156,14 @@ EnumTypeDefinition createEnum(Map<String, Object> input) {
                     .directives(createDeprecatedDirective(enumValue))
                     .build();
 
-            enumTypeDefinition.getEnumValueDefinitions().add(enumValueDefinition);
+            enumValueDefinitions.add(enumValueDefinition);
         }
 
-        return enumTypeDefinition;
+        return EnumTypeDefinition.newEnumTypeDefinition()
+                .name((String) input.get("name"))
+                .description(getDescription(input))
+                .enumValueDefinitions(enumValueDefinitions)
+                .build();
     }
 
     @SuppressWarnings("unchecked")