Skip to content

move generation of additional types to an iterative approach #619

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
merged 1 commit into from
Feb 26, 2020
Merged

move generation of additional types to an iterative approach #619

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
17 changes: 9 additions & 8 deletions ...in-schema-generator/src/main/kotlin/com/expediagroup/graphql/generator/SchemaGenerator.kt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -90,14 +90,15 @@ open class SchemaGenerator(internal val config: SchemaGeneratorConfig) {
* This function is recursive because while generating the additionalTypes it is possible to create additional types that need to be processed.
*/
protected open fun generateAdditionalTypes(): Set<GraphQLType> {
val currentlyProcessedTypes = this.additionalTypes.toSet()
this.additionalTypes.clear()
val graphqlTypes = currentlyProcessedTypes.map { generateGraphQLType(this, it) }.toSet()
val currentlyProcessedTypes = mutableSetOf<KType>()
val graphqlTypes = mutableSetOf<GraphQLType>()
do {
Copy link
Collaborator

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

i think you want to use while loop instead of do as additional types could be empty

Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Whoops, merged to fast. Yes it would execute the first time, it would iterate over an empty set so not doing to much, but a while could be clearer

currentlyProcessedTypes.addAll(this.additionalTypes)
this.additionalTypes.clear()
graphqlTypes.addAll(currentlyProcessedTypes.map { generateGraphQLType(this, it) })
currentlyProcessedTypes.clear()
Copy link
Collaborator

@dariuszkuc dariuszkuc Feb 26, 2020 •
edited
Loading

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

is constantly clearing the same object better than recreating the hash set?, e.g.

        val graphqlTypes = mutableSetOf<GraphQLType>()
        while (this.additionalTypes.isNotEmpty()) {
            val currentlyProcessedTypes = HashSet(this.additionalTypes)
            this.additionalTypes.clear()
            graphqlTypes.addAll(currentlyProcessedTypes.map { generateGraphQLType(this, it) })
        }
        return graphqlTypes.toSet()

} while (this.additionalTypes.isNotEmpty())

return if (this.additionalTypes.isNotEmpty()) {
graphqlTypes.plus(generateAdditionalTypes())
} else {
graphqlTypes
}
return graphqlTypes.toSet()
}
}
4 changes: 2 additions & 2 deletions ...chema-generator/src/test/kotlin/com/expediagroup/graphql/generator/SchemaGeneratorTest.kt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -48,7 +48,7 @@ class SchemaGeneratorTest {
val result = generator.generateCustomAdditionalTypes()

assertEquals(1, result.size)
assertEquals("SomeObjectWithAnnotaiton!", result.first().deepName)
assertEquals("SomeObjectWithAnnotation!", result.first().deepName)
}

class CustomSchemaGenerator(config: SchemaGeneratorConfig) : SchemaGenerator(config) {
Expand All @@ -61,5 +61,5 @@ class SchemaGeneratorTest {
annotation class MyOtherCustomAnnotation

@MyCustomAnnotation
data class SomeObjectWithAnnotaiton(val name: String)
data class SomeObjectWithAnnotation(val name: String)
}