Add support for unused types for all dictionary types

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

@@ -91,21 +91,24 @@ internal class SchemaClassScanner(
  do {
  val unusedDefinitions = (definitionsByName.values - (dictionary.keys.toSet() + unvalidatedTypes))
  .filter { definition -> definition.name != "PageInfo" }
- .filterIsInstance<ObjectTypeDefinition>().distinct()
+ .filter { isCompositeOrEnumType(it) }
+ .distinct()
 
  if (unusedDefinitions.isEmpty()) {
  break
  }
 
- val unusedDefinition = unusedDefinitions.first()
-
- handleDictionaryTypes(listOf(unusedDefinition)) { "Object type '${it.name}' is unused and includeUnusedTypes is true. Please pass a class for type '${it.name}' in the parser's dictionary." }
+ handleDictionaryTypes(unusedDefinitions) { "Type '${it.name}' is unused and includeUnusedTypes is true. Please pass a class for type '${it.name}' in the parser's dictionary." }
  } while (scanQueue())
  }
 
  return validateAndCreateResult(rootTypeHolder)
  }
 
+ private fun isCompositeOrEnumType(definition: TypeDefinition<*>): Boolean {
+ return definition is ObjectTypeDefinition || definition is InterfaceTypeDefinition || definition is UnionTypeDefinition || definition is EnumTypeDefinition
+ }
+
  private fun scanQueue(): Boolean {
  if (queue.isEmpty()) {
  return false
@@ -229,7 +232,7 @@ internal class SchemaClassScanner(
  }.flatten().distinct()
  }
 
- private fun handleDictionaryTypes(types: List<ObjectTypeDefinition>, failureMessage: (ObjectTypeDefinition) -> String) {
+ private fun handleDictionaryTypes(types: List<TypeDefinition<*>>, failureMessage: (TypeDefinition<*>) -> String) {
  types.forEach { type ->
  val dictionaryContainsType = dictionary.filter { it.key.name == type.name }.isNotEmpty()
  if (!unvalidatedTypes.contains(type) && !dictionaryContainsType) {

src/test/kotlin/graphql/kickstart/tools/SchemaClassScannerTest.kt

@@ -503,12 +503,19 @@ class SchemaClassScannerTest {
  type Implementation implements SomeInterface {
  value: String
  }
+
+ union SomeUnion = Unused | Implementation
+
+ enum SomeEnum {
+ A
+ B
+ }
  """)
  .resolvers(object : GraphQLQueryResolver {
  fun whatever(): Whatever? = null
  })
  .options(SchemaParserOptions.newOptions().includeUnusedTypes(true).build())
- .dictionary(Unused::class, Implementation::class)
+ .dictionary(Unused::class, Implementation::class, SomeInterface::class, SomeUnion::class, SomeEnum::class)
  .build()
  .makeExecutableSchema()
 

src/test/kotlin/graphql/kickstart/tools/TestInterfaces.kt

@@ -14,3 +14,10 @@ interface SomeInterface {
  fun getValue(): String?
 }
 
+interface SomeUnion
+
+enum class SomeEnum {
+ A,
+ B
+}
+