Merge pull request #327 from mkaulig/fix-schema-redundancy

oliemansm · web-flow · commit fcd00bf87e8d · 2019-11-14T14:01:28.000+01:00
Improve Schema Transformation
diff --git a/src/main/kotlin/com/coxautodev/graphql/tools/SchemaParser.kt b/src/main/kotlin/com/coxautodev/graphql/tools/SchemaParser.kt
@@ -126,7 +126,9 @@ class SchemaParser internal constructor(scanResult: ScannedSchemaObjects, privat
         val subscription = objects.find { it.name == subscriptionName }
                 ?: if (rootInfo.isSubscriptionRequired()) throw SchemaError("Expected a Subscription object with name '$subscriptionName' but found none!") else null
 
-        return SchemaObjects(query, mutation, subscription, (objects + inputObjects + enums + interfaces + unions).toSet(), codeRegistryBuilder)
+        val additionalObjects = objects.filter { o -> o != query && o != subscription && o != mutation }
+
+        return SchemaObjects(query, mutation, subscription, (additionalObjects + inputObjects + enums + interfaces + unions).toSet(), codeRegistryBuilder)
     }
 
     /**

Original file line number	Diff line number	Diff line change
`@@ -126,7 +126,9 @@ class SchemaParser internal constructor(scanResult: ScannedSchemaObjects, privat`
`126`	`126`	`val subscription = objects.find { it.name == subscriptionName }`
`127`	`127`	`?: if (rootInfo.isSubscriptionRequired()) throw SchemaError("Expected a Subscription object with name '$subscriptionName' but found none!") else null`
`128`	`128`
`129`		`- return SchemaObjects(query, mutation, subscription, (objects + inputObjects + enums + interfaces + unions).toSet(), codeRegistryBuilder)`
	`129`	`+ val additionalObjects = objects.filter { o -> o != query && o != subscription && o != mutation }`
	`130`	`+`
	`131`	`+ return SchemaObjects(query, mutation, subscription, (additionalObjects + inputObjects + enums + interfaces + unions).toSet(), codeRegistryBuilder)`
`130`	`132`	`}`
`131`	`133`
`132`	`134`	`/**`