Clean up

Author: vojtapol

src/main/kotlin/graphql/kickstart/tools/SchemaClassScanner.kt

@@ -84,13 +84,16 @@ internal class SchemaClassScanner(
             handleDictionaryTypes(getAllObjectTypeMembersOfDiscoveredUnions()) { "Object type '${it.name}' is a member of a known union, but no class could be found for that type name.  Please pass a class for type '${it.name}' in the parser's dictionary." }
         } while (scanQueue())
 
+        // Find unused types and include them if required
         if (options.includeUnusedTypes) {
             do {
                 val unusedDefinitions = (definitionsByName.values - (dictionary.keys.toSet() + unvalidatedTypes))
                     .filter { definition -> definition.name != "PageInfo" }
                     .filterIsInstance<ObjectTypeDefinition>().distinct()
 
-                if (unusedDefinitions.isEmpty()) break
+                if (unusedDefinitions.isEmpty()) {
+                    break
+                }
 
                 val unusedDefinition = unusedDefinitions.first()
 

src/test/groovy/graphql/kickstart/tools/SchemaClassScannerSpec.groovy

@@ -1,10 +1,6 @@
 package graphql.kickstart.tools
 
-import graphql.language.InputObjectTypeDefinition
-import graphql.language.InputObjectTypeExtensionDefinition
-import graphql.language.InterfaceTypeDefinition
-import graphql.language.ObjectTypeDefinition
-import graphql.language.ScalarTypeDefinition
+import graphql.language.*
 import graphql.schema.Coercing
 import graphql.schema.GraphQLScalarType
 import spock.lang.Specification
@@ -424,7 +420,8 @@ class SchemaClassScannerSpec extends Specification {
                         name: String
                     }
                     
-                    #these directives are defined in the Apollo Federation Specification: https://www.apollographql.com/docs/apollo-server/federation/federation-spec/
+                    # these directives are defined in the Apollo Federation Specification: 
+                    # https://www.apollographql.com/docs/apollo-server/federation/federation-spec/
                     type User @key(fields: "id") @extends {
                         id: ID! @external
                         recentPurchasedProducts: [Product]