Fix scan looping logic to actually exhaust all possibilities for finding objects (fixes graphql-java-kickstart#86)

apottere · apottere · commit 327a82bafd03 · 2017-11-23T14:11:30.000-05:00
diff --git a/src/main/kotlin/com/coxautodev/graphql/tools/SchemaClassScanner.kt b/src/main/kotlin/com/coxautodev/graphql/tools/SchemaClassScanner.kt
@@ -78,24 +78,34 @@ internal class SchemaClassScanner(initialDictionary: BiMap<String, Class<*>>, al
         handleRootType(rootTypeHolder.mutation)
         handleRootType(rootTypeHolder.subscription)
 
-        // Loop over all objects scanning each one only once for more objects to discover.
-        while(queue.isNotEmpty()) {
-            while (queue.isNotEmpty()) {
-                while (queue.isNotEmpty()) {
-                    scanQueueItemForPotentialMatches(queue.iterator().run { val item = next(); remove(); item })
-                }
+        scanQueue()
 
+        // Loop over all objects scanning each one only once for more objects to discover.
+        do {
+            do {
                 // Require all implementors of discovered interfaces to be discovered or provided.
-                handleInterfaceOrUnionSubTypes(getAllObjectTypesImplementingDiscoveredInterfaces(), { "Object type '${it.name}' implements a known interface, but no class was found for that type name.  Please pass a class for type '${it.name}' in the parser's dictionary." })
-            }
+                handleInterfaceOrUnionSubTypes(getAllObjectTypesImplementingDiscoveredInterfaces(), { "Object type '${it.name}' implements a known interface, 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())
 
             // Require all members of discovered unions to be discovered.
-            handleInterfaceOrUnionSubTypes(getAllObjectTypeMembersOfDiscoveredUnions(), { "Object type '${it.name}' is a member of a known union, but no class was found for that type name.  Please pass a class for type '${it.name}' in the parser's dictionary." })
-        }
+            handleInterfaceOrUnionSubTypes(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())
 
         return validateAndCreateResult(rootTypeHolder)
     }
 
+    private fun scanQueue(): Boolean {
+        if(queue.isEmpty()) {
+            return false
+        }
+
+        while (queue.isNotEmpty()) {
+            scanQueueItemForPotentialMatches(queue.iterator().run { val item = next(); remove(); item })
+        }
+
+        return true
+    }
+
     /**
      * Adds all root resolvers for a type to the list of classes to scan
      */
@@ -182,7 +192,7 @@ internal class SchemaClassScanner(initialDictionary: BiMap<String, Class<*>>, al
 
     private fun handleInterfaceOrUnionSubTypes(types: List<ObjectTypeDefinition>, failureMessage: (ObjectTypeDefinition) -> String) {
         types.forEach { type ->
-            if(!dictionary.containsKey(type)) {
+            if(!unvalidatedTypes.contains(type) && !dictionary.containsKey(type)) {
                 val initialEntry = initialDictionary[type.name] ?: throw SchemaClassScannerError(failureMessage(type))
                 handleFoundType(type, initialEntry.get(), DictionaryReference())
             }
diff --git a/src/test/groovy/com/coxautodev/graphql/tools/SchemaClassScannerSpec.groovy b/src/test/groovy/com/coxautodev/graphql/tools/SchemaClassScannerSpec.groovy
@@ -2,6 +2,7 @@ package com.coxautodev.graphql.tools
 
 import graphql.language.InputObjectTypeDefinition
 import graphql.language.InterfaceTypeDefinition
+import graphql.language.ObjectTypeDefinition
 import graphql.language.ScalarTypeDefinition
 import graphql.schema.Coercing
 import graphql.schema.GraphQLScalarType
@@ -319,4 +320,54 @@ class SchemaClassScannerSpec extends Specification {
     class Pojo {
         String name
     }
+
+    def "scanner should handle nested types in input types"() {
+        when:
+            ScannedSchemaObjects objects = SchemaParser.newParser()
+                .schemaString(''' 
+                    schema {
+                        query: Query
+                    }
+                    
+                    type Query {
+                        animal: Animal
+                    }
+                    
+                    interface Animal {
+                        type: ComplexType
+                    }
+                    
+                    type Dog implements Animal {
+                        type: ComplexType
+                    }
+                    
+                    type ComplexType {
+                        id: String
+                    }
+                ''')
+                .resolvers(new NestedInterfaceTypeQuery())
+                .dictionary(NestedInterfaceTypeQuery.Dog)
+                .scan()
+
+        then:
+            objects.definitions.findAll { it instanceof ObjectTypeDefinition }.size() == 3
+
+    }
+
+    class NestedInterfaceTypeQuery implements GraphQLQueryResolver {
+        Animal animal() { null }
+
+        interface Animal {
+            ComplexType type()
+        }
+
+        class Dog implements Animal {
+            @Override
+            ComplexType type() { null }
+        }
+
+        class ComplexType {
+            String id
+        }
+    }
 }
diff --git a/src/test/groovy/com/coxautodev/graphql/tools/SchemaParserSpec.groovy b/src/test/groovy/com/coxautodev/graphql/tools/SchemaParserSpec.groovy
@@ -167,54 +167,6 @@ class SchemaParserSpec extends Specification {
         then:
             noExceptionThrown()
     }
-
-    def "parser should parse interface with complex type"() {
-        when:
-            SchemaParser.newParser()
-                .schemaString(''' 
-                    schema {
-                        query: Query
-                    }
-                    
-                    type Query {
-                        animal: Animal
-                    }
-                    
-                    interface Animal {
-                        type: ComplexType
-                    }
-                    
-                    type Dog implements Animal {
-                        type: ComplexType
-                    }
-                    
-                    type ComplexType {
-                        id: String
-                    }
-                ''')
-                .resolvers(new ComplexQuery())
-                .build()
-                .makeExecutableSchema()
-
-        then:
-            noExceptionThrown()
-
-    }
-
-}
-
-class ComplexQuery implements GraphQLQueryResolver {
-    Animal animal() { null }
-
-    interface Animal {
-        ComplexType type = null
-    }
-
-    class Dog implements Animal { }
-
-    class ComplexType {
-        String id
-    }
 }
 
 class Filter {
